Mercurial > projects > ldc
changeset 1648:18bbb1436153 0.9.2
Change the ldc.conf file output to match the newer Tango directory structure and only use libtango-user-ldc for the libs to match the 0.99.9 build instructions.
author | Kelly Wilson <wilsonk cpsc.ucalgary.ca> |
---|---|
date | Wed, 10 Mar 2010 20:21:05 -0700 |
parents | 638a823ace45 |
children | 36da40ecbbe0 |
files | CMakeLists.txt ldc.conf.in runtime/CMakeLists.txt |
diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Wed Mar 10 19:35:14 2010 -0700 +++ b/CMakeLists.txt Wed Mar 10 20:21:05 2010 -0700 @@ -23,7 +23,6 @@ endif(NOT LIBCONFIGPP_FOUND) endif(NOT PKG_CONFIG_FOUND) - find_program(LLVM_CONFIG llvm-config ${LLVM_INSTDIR}/bin DOC "path to llvm-config tool") # get llvm's install dir. a little hackish, we could do something like llvm-config --prefix, but this does as well string(REPLACE "/bin/llvm-config" "" LLVM_DIR ${LLVM_CONFIG})
--- a/ldc.conf.in Wed Mar 10 19:35:14 2010 -0700 +++ b/ldc.conf.in Wed Mar 10 20:21:05 2010 -0700 @@ -12,7 +12,9 @@ // arguments before they are parsed. switches = [ "-I@RUNTIME_DIR@", + "-I@RUNTIME_DIR@/user", "-I@RUNTIME_DIR@/lib/common", + "-I@RUNTIME_DIR@/tango/core/vendor", "-L-L%%ldcbinarypath%%/../lib", "-d-version=Tango", "-defaultlib=@RUNTIME_AIO@",
--- a/runtime/CMakeLists.txt Wed Mar 10 19:35:14 2010 -0700 +++ b/runtime/CMakeLists.txt Wed Mar 10 20:21:05 2010 -0700 @@ -46,7 +46,7 @@ set(RUNTIME_CC tango-cc-tango) set(RUNTIME_GC tango-gc-basic) set(RUNTIME_DC ldc-runtime) - set(RUNTIME_AIO tango-base-ldc) + set(RUNTIME_AIO tango-user-ldc) # set paths to source files, or fill lists directly set(RUNTIME_DC_DIR ${PROJECT_SOURCE_DIR}/internal) set(RUNTIME_GC_DIR ${RUNTIME_DIR}/lib/gc/basic)