diff --git a/SimoxQtUtility/CMakeLists.txt b/SimoxQtUtility/CMakeLists.txt index d9630929a351459c13b7b9a22690664aecb48468..e30445216003e864c1dcd72596a2710a4a62ac39 100644 --- a/SimoxQtUtility/CMakeLists.txt +++ b/SimoxQtUtility/CMakeLists.txt @@ -4,8 +4,11 @@ MESSAGE (STATUS "\n***** CONFIGURING Simox project SimoxQtUtility *****") #################################### FILES ################################## SET(SOURCES + ) + SET(INCLUDES + ) if (qwt_FOUND) @@ -83,20 +86,24 @@ endif() # Finished adding UI files #----------------------------------------------------------------------------------- + SET_TARGET_PROPERTIES(SimoxQtUtility PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_BIN_DIR}) SET_TARGET_PROPERTIES(SimoxQtUtility PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${Simox_LIB_DIR}) SET_TARGET_PROPERTIES(SimoxQtUtility PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${Simox_LIB_DIR}) + + ####################################################################################### ############################ Setup for installation ################################### ####################################################################################### -install(TARGETS SimoxQtUtility +INSTALL(TARGETS SimoxQtUtility # IMPORTANT: Add the library to the "export-set" EXPORT SimoxTargets RUNTIME DESTINATION bin COMPONENT bin LIBRARY DESTINATION lib COMPONENT shlib ARCHIVE DESTINATION lib COMPONENT library - COMPONENT dev) + COMPONENT dev +) INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DESTINATION "${Simox_INSTALL_HEADER_DIR}" COMPONENT Headers @@ -110,7 +117,7 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DESTINATION PATTERN "build*" EXCLUDE PATTERN "data" EXCLUDE PATTERN "examples" EXCLUDE - ) +) INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION "." COMPONENT ApplicationData @@ -128,6 +135,6 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION "." PATTERN "*.bin" PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE - ) +) MESSAGE (STATUS "***** Finished CONFIGURING Simox project SimoxQtUtility *****\n") diff --git a/SimoxUtility/CMakeLists.txt b/SimoxUtility/CMakeLists.txt index 97ca95d941c505247ac28c21becb9f9510dba916..8286cbbf965aaa16c2164d4c3f9a0db3f98b1566 100644 --- a/SimoxUtility/CMakeLists.txt +++ b/SimoxUtility/CMakeLists.txt @@ -2,12 +2,6 @@ PROJECT ( SimoxUtility ) MESSAGE (STATUS "\n***** CONFIGURING Simox project SimoxUtility *****") - -########################################################################################################## -########################################################################################################## -########################################################################################################## - - #################################### FILES ################################## SET(SOURCES SimoxUtility.cpp @@ -361,17 +355,19 @@ SET_TARGET_PROPERTIES(SimoxUtility PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${Simox_B SET_TARGET_PROPERTIES(SimoxUtility PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${Simox_LIB_DIR}) SET_TARGET_PROPERTIES(SimoxUtility PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${Simox_LIB_DIR}) + ####################################################################################### ############################ Setup for installation ################################### ####################################################################################### -install(TARGETS SimoxUtility +INSTALL(TARGETS SimoxUtility # IMPORTANT: Add the library to the "export-set" EXPORT SimoxTargets RUNTIME DESTINATION bin COMPONENT bin LIBRARY DESTINATION lib COMPONENT shlib ARCHIVE DESTINATION lib COMPONENT library - COMPONENT dev) + COMPONENT dev +) INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DESTINATION "${Simox_INSTALL_HEADER_DIR}" COMPONENT Headers @@ -385,7 +381,7 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DESTINATION PATTERN "build*" EXCLUDE PATTERN "data" EXCLUDE PATTERN "examples" EXCLUDE - ) +) INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION "." COMPONENT ApplicationData @@ -403,6 +399,6 @@ INSTALL(DIRECTORY ${PROJECT_SOURCE_DIR}/data DESTINATION "." PATTERN "*.bin" PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE - ) +) MESSAGE (STATUS "***** Finished CONFIGURING Simox project SimoxUtility *****\n")