Mercurial > projects > ldc
changeset 829:0a31c60a6bc1
.. and fixed the install target (hopefully)
author | elrood |
---|---|
date | Fri, 05 Dec 2008 22:01:50 +0100 |
parents | 03b0c817a1a3 |
children | 504a21e81a46 |
files | CMakeLists.txt runtime/CMakeLists.txt |
diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Dec 04 22:09:24 2008 +0100 +++ b/CMakeLists.txt Fri Dec 05 22:01:50 2008 +0100 @@ -139,7 +139,7 @@ if(UNIX) add_definitions(-DPOSIX) - set(CONF_INST_DIR etc) + set(CONF_INST_DIR bin) endif(UNIX) if(USE_BOEHM_GC) @@ -185,7 +185,7 @@ # TODO: testrun install(TARGETS ${LDC_EXE} DESTINATION bin) +install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR}) +install(DIRECTORY ${PROJECT_BINARY_DIR}/lib DESTINATION . USE_SOURCE_PERMISSIONS) -install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE_NAME}.conf DESTINATION ${CONF_INST_DIR}) - -add_subdirectory(runtime) +add_subdirectory(runtime EXCLUDE_FROM_ALL)
--- a/runtime/CMakeLists.txt Thu Dec 04 22:09:24 2008 +0100 +++ b/runtime/CMakeLists.txt Fri Dec 05 22:01:50 2008 +0100 @@ -74,7 +74,7 @@ set(LDC_EXE_NAME ${LDC_EXE}) endif(NOT LDC_LOC) -configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE_NAME}.conf) +configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf) # patch runtime source, uses LDC_EXE for ldc / ldc2 find_program(PATCH_EXE patch DOC "path to patch tool") @@ -177,5 +177,3 @@ # BCLIBS is empty if BUILD_BC_LIBS is not selected add_custom_target(runtime DEPENDS ${LIBS} ${BCLIBS}) - -install(DIRECTORY ${PROJECT_BINARY_DIR}/../lib DESTINATION .) \ No newline at end of file