Bläddra i källkod

Merge branch '123-fix-python-wrapping-configure'. Closes #123

* 123-fix-python-wrapping-configure:
  Fix configuration of ctk/__init__.py.in. See #123
  Pass option CTK_ENABLE_Python_Wrapping from Superbuild to inner build. See #123
Jean-Christophe Fillion-Robin 13 år sedan
förälder
incheckning
4f6e274355
2 ändrade filer med 13 tillägg och 13 borttagningar
  1. 12 12
      Libs/Scripting/Python/Core/Python/CMakeLists.txt
  2. 1 1
      SuperBuild.cmake

+ 12 - 12
Libs/Scripting/Python/Core/Python/CMakeLists.txt

@@ -8,13 +8,13 @@ set(KIT_PYTHON_SCRIPTS
 #  list(APPEND KIT_PYTHON_SCRIPTS ctkvtk/__init__)
 #endif()
 
+# If it applies, the variable CTK_PYTHON_WRAPPED_LIBRARIES will contain
+# the comma separated list of package to load
+set(CTK_PYTHON_WRAPPED_LIBRARIES)
+
 if(CTK_WRAP_PYTHONQT_LIGHT OR CTK_WRAP_PYTHONQT_FULL)
 
-  # Configure variable CTK_PYTHON_WRAPPED_LIBRARIES that will contain
-  # the comma separated list of package to load
-  set(CTK_PYTHON_WRAPPED_LIBRARIES)
-  foreach(lib ${CTK_LIBS})
-    ctkFunctionExtractOptionNameAndValue(${lib} lib_name lib_value)
+  foreach(lib_name ${CTK_LIBS})
     if(${CTK_LIB_${lib_name}})
       string(REPLACE "/" "" lib_name_no_slash ${lib_name})
       set(lib_name_no_slash "'${lib_name_no_slash}'") # Add single quotes
@@ -22,15 +22,15 @@ if(CTK_WRAP_PYTHONQT_LIGHT OR CTK_WRAP_PYTHONQT_FULL)
     endif()
   endforeach()
 
-  configure_file(
-    ctk/__init__.py.in
-    ${CMAKE_CURRENT_BINARY_DIR}/ctk/__init__.py
-    @ONLY
-    )
-
-  list(APPEND KIT_PYTHON_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ctk/__init__.py)
 endif()
 
+configure_file(
+  ctk/__init__.py.in
+  ${CMAKE_CURRENT_BINARY_DIR}/ctk/__init__.py
+  @ONLY
+  )
+list(APPEND KIT_PYTHON_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/ctk/__init__.py)
+
 set(KIT_PYTHON_RESOURCES
   )
 

+ 1 - 1
SuperBuild.cmake

@@ -78,7 +78,7 @@ set(ctk_cmake_boolean_args
   DOCUMENTATION_TARGET_IN_ALL
   CTEST_USE_LAUNCHERS
   CTK_WRAP_PYTHONQT_FULL
-  CTK_WRAP_PYTHONQT_LIGHT
+  CTK_ENABLE_Python_Wrapping
   ${ctk_libs_bool_vars}
   ${ctk_plugins_bool_vars}
   ${ctk_applications_bool_vars}