Merge branch 'differenciate-runtime-components'

* differenciate-runtime-components:
  Install - Associate libraries, apps and plugins to specific component

CMake/ctkMacroBuildApp.cmake

@@ -55,16 +55,16 @@ MACRO(ctkMacroBuildApp)
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${MY_INCLUDE_DIRECTORIES}
-    )  
+    )
 
   # Add the include directories from the library dependencies
   ctkFunctionGetIncludeDirs(my_includes ${proj_name})
 
   INCLUDE_DIRECTORIES(${my_includes})
-  
+
   # Add the library directories from the external project
   ctkFunctionGetLibraryDirs(my_library_dirs ${proj_name})
-  
+
   LINK_DIRECTORIES(
     ${my_library_dirs}
     )
@@ -108,18 +108,17 @@ MACRO(ctkMacroBuildApp)
 
   # Set labels associated with the target.
   SET_TARGET_PROPERTIES(${proj_name} PROPERTIES LABELS ${proj_name})
-  
+
   # Install rules
   INSTALL(TARGETS ${proj_name}
-    RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-    LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
-    ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
+    RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT RuntimeApplications
+    )
 
   SET(my_libs
     ${MY_TARGET_LIBRARIES}
     )
   TARGET_LINK_LIBRARIES(${proj_name} ${my_libs})
-  
+
   # Install headers
   FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   INSTALL(FILES

CMake/ctkMacroBuildLib.cmake

@@ -141,8 +141,7 @@ MACRO(ctkMacroBuildLib)
   # Install rules
   IF(MY_LIBRARY_TYPE STREQUAL "SHARED")
     INSTALL(TARGETS ${lib_name}
-      RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-      LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+      LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
       ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF()
 

CMake/ctkMacroBuildLibWrapper.cmake

@@ -145,8 +145,7 @@ MACRO(ctkMacroBuildLibWrapper)
   # Install rules
   IF(NOT MY_NO_INSTALL AND MY_WRAPPER_LIBRARY_TYPE STREQUAL "MODULE")
     INSTALL(TARGETS ${lib_name}PythonQt
-      RUNTIME DESTINATION ${MY_INSTALL_BIN_DIR} COMPONENT Runtime
-      LIBRARY DESTINATION ${MY_INSTALL_LIB_DIR} COMPONENT Runtime
+      LIBRARY DESTINATION ${MY_INSTALL_LIB_DIR} COMPONENT RuntimePlugins
       ARCHIVE DESTINATION ${MY_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF()
 

CMake/ctkMacroBuildPlugin.cmake

@@ -57,7 +57,7 @@ MACRO(ctkMacroBuildPlugin)
   IF(NOT DEFINED MY_EXPORT_DIRECTIVE)
     MESSAGE(FATAL_ERROR "EXPORT_DIRECTIVE is mandatory")
   ENDIF()
- 
+
   # Plugin are expected to be shared library
   SET(MY_LIBRARY_TYPE "SHARED")
 
@@ -114,7 +114,7 @@ MACRO(ctkMacroBuildPlugin)
 
     SET(my_includes )
   ENDIF()
-  
+
   LIST(APPEND my_includes
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_CURRENT_BINARY_DIR}
@@ -131,18 +131,18 @@ MACRO(ctkMacroBuildPlugin)
 
   # Add Qt include dirs and defines
   INCLUDE(${QT_USE_FILE})
-    
+
   # Add the library directories from the external project
   ctkFunctionGetLibraryDirs(my_library_dirs ${lib_name})
-  
+
   LINK_DIRECTORIES(
     ${my_library_dirs}
     )
- 
+
   SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
   SET(MY_EXPORT_HEADER_PREFIX "${lib_name}_")
   SET(MY_LIBNAME ${lib_name})
-  
+
   CONFIGURE_FILE(
     ${CTK_EXPORT_HEADER_TEMPLATE}
     ${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h
@@ -245,7 +245,7 @@ MACRO(ctkMacroBuildPlugin)
     ${MY_UI_CPP}
     ${_plugin_qm_files}
     )
-  
+
   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
     ${MY_SRCS}
     ${MY_MOC_CPP}
@@ -304,11 +304,10 @@ MACRO(ctkMacroBuildPlugin)
   # Install rules
 # IF(MY_LIBRARY_TYPE STREQUAL "SHARED")
 # INSTALL(TARGETS ${lib_name}
-# RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR} COMPONENT Runtime
-# LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Runtime
+# LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT RuntimePlugins
 # ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
 # ENDIF()
-  
+
   SET(my_libs
     ${MY_TARGET_LIBRARIES}
     )
@@ -323,7 +322,7 @@ MACRO(ctkMacroBuildPlugin)
   IF(NOT MY_TEST_PLUGIN)
     SET(CTK_PLUGIN_LIBRARIES ${CTK_PLUGIN_LIBRARIES} ${lib_name} CACHE INTERNAL "CTK plugins" FORCE)
   ENDIF()
-  
+
   # Install headers
   #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
   #INSTALL(FILES

CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -57,12 +57,12 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
   INCLUDE_DIRECTORIES(
     ${my_includes}
     )
- 
+
   SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MY_EXPORT_DIRECTIVE})
   SET(MY_EXPORT_HEADER_PREFIX ${MY_NAME})
   STRING(REGEX REPLACE "^CTK" "ctk" MY_EXPORT_HEADER_PREFIX ${MY_EXPORT_HEADER_PREFIX})
   SET(MY_LIBNAME ${lib_name})
-  
+
   CONFIGURE_FILE(
     ${CTK_SOURCE_DIR}/Libs/ctkExport.h.in
     ${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h
@@ -100,17 +100,17 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
     ${MY_UI_CPP}
     ${MY_QRC_SRCS}
     )
-  
+
   # Extract library name associated with the plugin and use it as label
   STRING(REGEX REPLACE "(.*)Plugins" "\\1" label ${lib_name})
-  
+
   # Apply properties to the library target.
   SET_TARGET_PROPERTIES(${lib_name}  PROPERTIES
     COMPILE_FLAGS "-DQT_PLUGIN"
     LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/designer"
     LABELS ${label}
     )
-  
+
   SET(my_libs
     ${MY_TARGET_LIBRARIES}
     ${QT_QTDESIGNER_LIBRARY}
@@ -119,25 +119,25 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
 
   # Install the library
   INSTALL(TARGETS ${lib_name}
-    RUNTIME DESTINATION ${CTK_INSTALL_BIN_DIR}/designer COMPONENT Runtime
-    LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT Runtime
-    ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT Development)
+    LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT RuntimePlugins
+    ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT Development
+    )
 
   # Install headers - Are headers required ?
   #FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-  #INSTALL(FILES 
+  #INSTALL(FILES
   #  ${headers}
   #  DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
   #  )
 
-  
+
   # Since QtDesigner expects plugin to be directly located under the
-  # directory 'designer', let's copy them. 
+  # directory 'designer', let's copy them.
 
   IF(NOT CMAKE_CFG_INTDIR STREQUAL ".")
     GET_TARGET_PROPERTY(FILE_PATH ${lib_name} LOCATION)
     GET_TARGET_PROPERTY(DIR_PATH ${lib_name} LIBRARY_OUTPUT_DIRECTORY)
-  
+
     ADD_CUSTOM_COMMAND(
       TARGET ${lib_name}
       POST_BUILD

CTKConfig.cmake.in

@@ -154,7 +154,7 @@ SET(CTK_CMAKE_UTILITIES_DIR "@CTK_CMAKE_UTILITIES_DIR_CONFIG@")
 #SET(CTK_DOXYGEN_HOME "@CTK_DOXYGEN_HOME_CONFIG@")
 
 # TODO Relative install paths in the CTK install tree
-#SET(CTK_INSTALL_BIN_DIR "@CTK_INSTALL_BIN_DIR@")
+SET(CTK_INSTALL_BIN_DIR "@CTK_INSTALL_BIN_DIR@")
 SET(CTK_INSTALL_INCLUDE_DIR "@CTK_INSTALL_INCLUDE_DIR@")
 SET(CTK_INSTALL_LIB_DIR "@CTK_INSTALL_LIB_DIR@")
 #SET(CTK_INSTALL_PACKAGE_DIR "@CTK_INSTALL_PACKAGE_DIR@")