Commit ad0e07d6 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'shiboken-pythonpath-patch'

6b4d03eb shiboken: always set an absolute PYTHONPATH in the config file
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !200
parents ae5ddfdd 6b4d03eb
diff -U5 -Nru shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/CMakeLists.txt shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/CMakeLists.txt
--- shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/CMakeLists.txt 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/CMakeLists.txt 2016-10-12 14:27:38.282098275 -0400
@@ -6,10 +6,16 @@
add_custom_target(data)
add_dependencies(data shiboken)
get_target_property(SHIBOKEN_GENERATOR shiboken OUTPUT_NAME)
+if (IS_ABSOLUTE "${PYTHON_SITE_PACKAGES}")
+ set(SBK_PYTHONPATH "${PYTHON_SITE_PACKAGES}")
+else ()
+ set(SBK_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES}")
+endif ()
+
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig.cmake" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfig-spec.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/ShibokenConfig${PYTHON_SUFFIX}.cmake" @ONLY)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ShibokenConfigVersion.cmake.in"
diff -U5 -Nru shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/ShibokenConfig-spec.cmake.in shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/ShibokenConfig-spec.cmake.in
--- shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21/data/ShibokenConfig-spec.cmake.in 2016-06-02 14:57:59.000000000 -0400
+++ shiboken-110e45fa9d873afea4d7ae47da3fb678b1831a21.pythonpath/data/ShibokenConfig-spec.cmake.in 2016-10-12 14:27:44.668289167 -0400
@@ -13,11 +13,11 @@
elseif(WIN32)
SET(SHIBOKEN_LIBRARY "@CMAKE_INSTALL_PREFIX@/bin/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
else()
SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
endif()
-SET(SHIBOKEN_PYTHONPATH "@PYTHON_SITE_PACKAGES@")
+SET(SHIBOKEN_PYTHONPATH "@SBK_PYTHONPATH@")
SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
SET(SHIBOKEN_PYTHON_INCLUDE_DIR "@SBK_PYTHON_INCLUDE_DIR@")
SET(SHIBOKEN_PYTHON_INTERPRETER "@PYTHON_EXECUTABLE@")
SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@")
SET(SHIBOKEN_PYTHON_SUFFIX "@PYTHON_SUFFIX@")
......@@ -12,3 +12,6 @@ superbuild_add_project(shiboken
-DDISABLE_DOCSTRINGS:BOOL=ON
-DBUILD_TESTS:BOOL=OFF
${shiboken_extra_args})
superbuild_apply_patch(shiboken pythonpath
"Fix relative python path settings")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment