Browse Source

Merge branch 'differenciate-runtime-components'

* differenciate-runtime-components:
  Make sure RUNTIME target type is considered in "library" install rules
Jean-Christophe Fillion-Robin 13 years ago
parent
commit
41da2a1da8

+ 1 - 0
CMake/ctkMacroBuildLib.cmake

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

+ 1 - 0
CMake/ctkMacroBuildLibWrapper.cmake

@@ -145,6 +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_LIB_DIR} COMPONENT RuntimePlugins
       LIBRARY DESTINATION ${MY_INSTALL_LIB_DIR} COMPONENT RuntimePlugins
       ARCHIVE DESTINATION ${MY_INSTALL_LIB_DIR} COMPONENT Development)
   ENDIF()

+ 1 - 0
CMake/ctkMacroBuildPlugin.cmake

@@ -304,6 +304,7 @@ MACRO(ctkMacroBuildPlugin)
   # Install rules
 # IF(MY_LIBRARY_TYPE STREQUAL "SHARED")
 # INSTALL(TARGETS ${lib_name}
+# RUNTIME DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT RuntimePlugins
 # LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT RuntimePlugins
 # ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR} COMPONENT Development)
 # ENDIF()

+ 1 - 0
CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -117,6 +117,7 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
 
   # Install the library
   INSTALL(TARGETS ${lib_name}
+    RUNTIME DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT RuntimePlugins
     LIBRARY DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT RuntimePlugins
     ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT Development
     )