From 32cbc798c0f382d8be4c2df943a6e26d89efc6b0 Mon Sep 17 00:00:00 2001 From: Jonathan MERCIER Date: Wed, 12 Oct 2011 03:03:42 +0200 Subject: [PATCH] Install lib could go to lib or lib64 directory by example for follow os rules --- CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79804a10..8d36eee6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,8 +66,9 @@ set(PROGRAM_PREFIX "" set(PROGRAM_SUFFIX "" CACHE STRING "appended to ldc binary name") set(LIB_SUFFIX "" CACHE STRING "Suffix to add add for lib directory e.g: 64 => lib64") set(SYSCONF_INSTALL_DIR "/etc" CACHE STRING "Default path where configuration file go for install") -set(CMAKE_INSTALL_LIBDIR "lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will be installed") -set(CONF_INST_DIR "${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}" CACHE STRING "Set ldc.conf directory for installation") +set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Set prefix for installation") +set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "Directory where lib will be installed") +set(CONF_INST_DIR "${CMAKE_INSTALL_PREFIX}/${SYSCONF_INSTALL_DIR}" CACHE PATH "Set ldc.conf directory for installation") option(USE_BOEHM_GC "use the Boehm garbage collector internally") option(GENERATE_OFFTI "generate complete ClassInfo.offTi arrays") option(USE_METADATA "use metadata and related custom optimization passes") @@ -279,11 +280,11 @@ endif(USE_BOEHM_GC) get_target_property(LDC_LOC ${LDC_EXE} LOCATION) # TODO: testrun - -install(TARGETS ${LDC_EXE} DESTINATION bin) -install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/${LDMD_EXE} DESTINATION bin) -install(FILES ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR}) -install(FILES ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.rebuild.conf DESTINATION ${CONF_INST_DIR}) -install(DIRECTORY ${PROJECT_SOURCE_DIR}/lib DESTINATION . USE_SOURCE_PERMISSIONS) +FILE(GLOB library "${PROJECT_SOURCE_DIR}/lib/*.a" "${PROJECT_SOURCE_DIR}/lib/*.so" "${PROJECT_SOURCE_DIR}/lib/*.dll") +install(TARGETS ${LDC_EXE} DESTINATION bin) +install(PROGRAMS ${PROJECT_SOURCE_DIR}/bin/${LDMD_EXE} DESTINATION bin) +install(FILES ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR}) +install(FILES ${PROJECT_SOURCE_DIR}/bin/${LDC_EXE}.rebuild.conf DESTINATION ${CONF_INST_DIR}) +install(FILES ${library} DESTINATION ${CMAKE_INSTALL_LIBDIR}) add_subdirectory(runtime EXCLUDE_FROM_ALL)