瀏覽代碼

Merge branch 'export-pythonqt-targets'

* export-pythonqt-targets:
  Wrapped CTK libraries are now exported
  Disable PythonQt wrapping for CTKDummyPlugin library
  Add DISABLE_WRAP_PYTHONQT option to ctkMacroBuildLib
Jean-Christophe Fillion-Robin 14 年之前
父節點
當前提交
41270a6e1f

+ 2 - 2
CMake/ctkMacroBuildLib.cmake

@@ -26,7 +26,7 @@
 MACRO(ctkMacroBuildLib)
   ctkMacroParseArguments(MY
     "NAME;EXPORT_DIRECTIVE;SRCS;MOC_SRCS;UI_FORMS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES;RESOURCES;LIBRARY_TYPE"
-    ""
+    "DISABLE_WRAP_PYTHONQT"
     ${ARGN}
     )
 
@@ -147,7 +147,7 @@ MACRO(ctkMacroBuildLib)
     DESTINATION ${CTK_INSTALL_INCLUDE_DIR} COMPONENT Development
     )
 
-  IF(CTK_WRAP_PYTHONQT_LIGHT OR CTK_WRAP_PYTHONQT_FULL)
+  IF((CTK_WRAP_PYTHONQT_LIGHT OR CTK_WRAP_PYTHONQT_FULL) AND NOT ${MY_DISABLE_WRAP_PYTHONQT})
     set(KIT_PYTHONQT_SRCS) # Clear variable
     ctkMacroWrapPythonQt("org.commontk" ${lib_name}
       KIT_PYTHONQT_SRCS "${MY_SRCS}" ${CTK_WRAP_PYTHONQT_FULL})

+ 1 - 0
Libs/Core/Testing/Cpp/CMakeLists.txt

@@ -7,6 +7,7 @@ ctkMacroBuildLib(
   MOC_SRCS "ctkDummyPlugin.h"
   TARGET_LIBRARIES ${CTK_BASE_LIBRARIES}
   LIBRARY_TYPE "SHARED"
+  DISABLE_WRAP_PYTHONQT
   )
 GET_TARGET_PROPERTY(ctkDummyPluginPATH "CTKDummyPlugin" LOCATION)
 REMOVE_DEFINITIONS(-DCTKDummyPlugin)

+ 9 - 1
Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -64,9 +64,17 @@ SET(CTK_CONFIG_INSTALL_ONLY)
 # The "use" file.
 SET(CTK_USE_FILE ${CTK_SUPERBUILD_BINARY_DIR}/UseCTK.cmake)
 
+# Generate list of target to exports
+SET(CTK_TARGETS_TO_EXPORT ${CTK_LIBRARIES} ${CTK_PLUGIN_LIBRARIES})
+
+# Append CTK PythonQt static libraries
+FOREACH(lib ${CTK_WRAPPED_LIBRARIES_PYTHONQT})
+  LIST(APPEND CTK_TARGETS_TO_EXPORT ${lib}PythonQt)
+ENDFOREACH()
+
 # Export targets so they can be imported by a project using CTK
 # as an external library
-EXPORT(TARGETS ${CTK_LIBRARIES} ${CTK_PLUGIN_LIBRARIES} FILE ${CTK_SUPERBUILD_BINARY_DIR}/CTKExports.cmake)
+EXPORT(TARGETS ${CTK_TARGETS_TO_EXPORT} FILE ${CTK_SUPERBUILD_BINARY_DIR}/CTKExports.cmake)
 
 # Write a set of variables containing plugin specific include directories
 SET(CTK_PLUGIN_INCLUDE_DIRS_CONFIG)