Mercurial > projects > ldc
changeset 1519:6182ceeb336a
LLVM_INSTDIR -> LLVM_INCLUDEDIR fix by d0k.
| author | Christian Kamm <kamm incasoftware de> |
|---|---|
| date | Mon, 29 Jun 2009 21:44:11 +0200 |
| parents | 26d061e61b02 |
| children | 1a93c3da09ef |
| files | CMakeLists.txt |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Fri Jun 26 21:02:23 2009 +0200 +++ b/CMakeLists.txt Mon Jun 29 21:44:11 2009 +0200 @@ -53,6 +53,11 @@ OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ) +execute_process( + COMMAND ${PERL_EXECUTABLE} ${LLVM_CONFIG} --includedir + OUTPUT_VARIABLE LLVM_INCLUDEDIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) set(D_VERSION 1 CACHE STRING "D language version") set(PROGRAM_PREFIX CACHE STRING "prepended to ldc binary name") @@ -126,7 +131,7 @@ set(DEFAULT_TARGET ${HOST_TARGET} CACHE STRING "default target") set(DEFAULT_ALT_TARGET ${HOST_ALT_TARGET} CACHE STRING "default alt target") -include_directories(. ${DMDFE_PATH} ${DMDFE_PATH}/root ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ${PROJECT_BINARY_DIR} ${LLVM_INSTDIR}/include) +include_directories(. ${DMDFE_PATH} ${DMDFE_PATH}/root ${PROJECT_BINARY_DIR}/${DMDFE_PATH} ${PROJECT_BINARY_DIR} ${LLVM_INCLUDEDIR}) set(EXTRA_LLVM_MODULES "" CACHE STRING "extra llvm components to link in (see llvm-config --components)") separate_arguments(EXTRA_LLVM_MODULES) @@ -138,7 +143,7 @@ # build a define that contains all LLVM targets required and is usable for # preprocessor code generation. start with the native target. -file(STRINGS ${LLVM_INSTDIR}/include/llvm/Config/config.h LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH") +file(STRINGS ${LLVM_INCLUDEDIR}/llvm/Config/config.h LLVM_NATIVE_ARCH REGEX "^#define LLVM_NATIVE_ARCH") string(REGEX REPLACE "^#define LLVM_NATIVE_ARCH (.*)Target$" "\\1" LLVM_NATIVE_ARCH ${LLVM_NATIVE_ARCH}) set(LLVM_MODULES_DEFINE "LLVM_TARGET(${LLVM_NATIVE_ARCH})") # chain the extra target list to the define