瀏覽代碼

ctkMacroCompilePythonScript internally includes ctkMacroParseArguments

ctkMacroParseArguments is referenced using CTK_CMAKE_DIR.

In case the macro is used by a different project including CTK,
the path to the macro will be properly resolved since CTK_CMAKE_DIR
is set in CTKConfig.cmake
Jean-Christophe Fillion-Robin 14 年之前
父節點
當前提交
8ead6f8fef
共有 2 個文件被更改,包括 6 次插入4 次删除
  1. 2 0
      CMake/ctkMacroCompilePythonScript.cmake
  2. 4 4
      CMakeLists.txt

+ 2 - 0
CMake/ctkMacroCompilePythonScript.cmake

@@ -5,6 +5,8 @@
 #          ParaView/VTK/Wrapping/Python/CMakeLists.txt
 #
 
+INCLUDE(${CTK_CMAKE_DIR}/ctkMacroParseArguments.cmake)
+
 MACRO(ctkMacroCompilePythonScript)
   ctkMacroParseArguments(MY
     "TARGET_NAME;SCRIPTS;RESOURCES;DESTINATION_DIR;INSTALL_DIR"

+ 4 - 4
CMakeLists.txt

@@ -132,6 +132,10 @@ SET(CTK_WRAPPED_LIBRARIES_PYTHONQT CACHE INTERNAL "CTK libraries wrapped using P
 # Variable use in CTKConfig.cmake.in
 SET(CTK_LIBRARIES CACHE INTERNAL "CTK libraries" FORCE)
 
+# Used by CTKGenerateCTKConfig.cmake and also used to reference script from other scripts
+SET(CTK_CMAKE_DIR ${CTK_SOURCE_DIR}/CMake)
+SET(CTK_CMAKE_UTILITIES_DIR ${CTK_SOURCE_DIR}/Utilities/CMake)
+
 #-----------------------------------------------------------------------------
 # CMake Function(s) and Macro(s)
 #
@@ -155,10 +159,6 @@ INCLUDE(CMake/ctkFunctionGeneratePluginManifest.cmake)
 INCLUDE(CMake/ctkMacroGeneratePluginResourceFile.cmake)
 INCLUDE(CMake/ctkFunctionCheckCompilerFlags.cmake)
 
-# Used by CTKGenerateCTKConfig.cmake
-SET(CTK_CMAKE_DIR ${CTK_SOURCE_DIR}/CMake)
-SET(CTK_CMAKE_UTILITIES_DIR ${CTK_SOURCE_DIR}/Utilities/CMake)
-
 #-----------------------------------------------------------------------------
 # Testing
 #