.. and fixed the install target (hopefully)

This commit is contained in:
elrood
2008-12-05 22:01:50 +01:00
parent 5321c34637
commit 0085c9409c
2 changed files with 5 additions and 7 deletions

View File

@@ -139,7 +139,7 @@ add_definitions(
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 @@ get_target_property(LDC_LOC ${LDC_EXE} LOCATION)
# 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)

View File

@@ -74,7 +74,7 @@ if(NOT LDC_LOC)
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 @@ set_target_properties(
# BCLIBS is empty if BUILD_BC_LIBS is not selected
add_custom_target(runtime DEPENDS ${LIBS} ${BCLIBS})
install(DIRECTORY ${PROJECT_BINARY_DIR}/../lib DESTINATION .)