Преглед на файлове

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 преди 14 години
родител
ревизия
d9e405671c
променени са 4 файла, в които са добавени 4 реда и са изтрити 0 реда
  1. 1 0
      CMake/ctkMacroBuildLib.cmake
  2. 1 0
      CMake/ctkMacroBuildLibWrapper.cmake
  3. 1 0
      CMake/ctkMacroBuildPlugin.cmake
  4. 1 0
      CMake/ctkMacroBuildQtDesignerPlugin.cmake

+ 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

@@ -294,6 +294,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

@@ -119,6 +119,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
     )