Просмотр исходного кода

Make sure RUNTIME target type is considered in "library" install rules

Since DLL are considered as RUNTIME target, this will ensure that
libraries, plugins, etc .. are installed in the expected location on windows.
Jean-Christophe Fillion-Robin лет назад: 13
Родитель
Сommit
d9e405671c

+ 1 - 0
CMake/ctkMacroBuildLib.cmake

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

+ 1 - 0
CMake/ctkMacroBuildLibWrapper.cmake

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

+ 1 - 0
CMake/ctkMacroBuildPlugin.cmake

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

+ 1 - 0
CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -119,6 +119,7 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
 
 
   # Install the library
   # Install the library
   INSTALL(TARGETS ${lib_name}
   INSTALL(TARGETS ${lib_name}
+    RUNTIME DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT RuntimePlugins
     LIBRARY 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
     ARCHIVE DESTINATION ${CTK_INSTALL_LIB_DIR}/designer COMPONENT Development
     )
     )