From 0cebc6d5bcf013f25dfa5624f4e984b06e96c401 Mon Sep 17 00:00:00 2001 From: Jonathan MERCIER Date: Wed, 15 Feb 2012 13:59:50 +0100 Subject: [PATCH] use D_VERSION instead of DMDFE_MAJOR_VERSION --- runtime/CMakeLists.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 800e9808..e8089f94 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -16,17 +16,16 @@ if(${ptr_size} MATCHES "^8$") ## if it's 64-bit OS set(IS_64BIT_OS 1) endif(${ptr_size} MATCHES "^8$") -set(DMDFE_MAJOR_VERSION 2 CACHE INT "Major version of dmd frontend") -set(DMDFE_MINOR_VERSION 0 CACHE INT "Minor version of dmd frontend") -set(DMDFE_PATCH_VERSION 57 CACHE INT "Patch version of dmd frontend") -set(DMDFE_VERSION ${DMDFE_MAJOR_VERSION}.${DMDFE_MINOR_VERSION}.${DMDFE_PATCH_VERSION} CACHE INT "Version of dmd frontend") -set(MULTILIB OFF CACHE BOOL "Build both 64-bit and 32-bit libraries") -set(BUILD_BC_LIBS OFF CACHE BOOL "Build the runtime as bytecode libraries") -set(BUILD_SINGLE_LIB ON CACHE BOOL "Build single runtime library") -set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib will be installed: lib or lib64") -set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/d CACHE PATH "Directory where will be put header files") -set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build as shared library or as static library") -set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Directory where lib will be installed") +set(DMDFE_MINOR_VERSION 0 CACHE INT "Minor version of dmd frontend") +set(DMDFE_PATCH_VERSION 57 CACHE INT "Patch version of dmd frontend") +set(DMDFE_VERSION ${D_VERSION}.${DMDFE_MINOR_VERSION}.${DMDFE_PATCH_VERSION} CACHE INT "Version of dmd frontend") +set(MULTILIB OFF CACHE BOOL "Build both 64-bit and 32-bit libraries") +set(BUILD_BC_LIBS OFF CACHE BOOL "Build the runtime as bytecode libraries") +set(BUILD_SINGLE_LIB ON CACHE BOOL "Build single runtime library") +set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib will be installed: lib or lib64") +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/d CACHE PATH "Directory where will be put header files") +set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build as shared library or as static library") +set(CMAKE_INSTALL_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Directory where lib will be installed") set(D_FLAGS -g -w -d CACHE STRING "runtime build flags, separated by ;") if(BUILD_SHARED_LIBS)