File shiboken-fix-include-with-suffix.patch of Package python-pyside-shiboken

Overview Repositories Revisions Requests Users Attributes Meta

File shiboken-fix-include-with-suffix.patch of Package python-pyside-shiboken (Revision 6524cce0f981aa14372d94597ec4fc83)

Currently displaying revision 6524cce0f981aa14372d94597ec4fc83 , Show latest

diff -Naur shiboken-1.2.2/CMakeLists.txt shiboken-1.2.2_fixed/CMakeLists.txt
--- shiboken-1.2.2/CMakeLists.txt	2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/CMakeLists.txt	2015-07-19 23:36:15.872381253 +0200
@@ -111,6 +111,13 @@
     set(SBK_PYTHON_INCLUDE_DIR ${PYTHON_INCLUDE_DIRS})
 endif()
 
+option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
+if(ENABLE_VERSION_SUFFIX)
+    set(shiboken_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
+else()
+    set(shiboken_SUFFIX "")
+endif()
+
 add_subdirectory(libshiboken)
 add_subdirectory(doc)
 
diff -Naur shiboken-1.2.2/data/shiboken.pc.in shiboken-1.2.2_fixed/data/shiboken.pc.in
--- shiboken-1.2.2/data/shiboken.pc.in	2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/data/shiboken.pc.in	2015-07-19 23:37:00.352077907 +0200
@@ -10,4 +10,4 @@
 Description: Support library for Python bindings created with Shiboken generator.
 Version: @shiboken_VERSION@
 Libs: @SBK_PYTHON_LIBRARIES@ -L${libdir} -lshiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
-Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}/@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
+Cflags: -I@SBK_PYTHON_INCLUDE_DIR@ -I${includedir}@shiboken_SUFFIX@@SBK_PKG_CONFIG_PY_DEBUG_DEFINITION@
diff -Naur shiboken-1.2.2/libshiboken/CMakeLists.txt shiboken-1.2.2_fixed/libshiboken/CMakeLists.txt
--- shiboken-1.2.2/libshiboken/CMakeLists.txt	2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/libshiboken/CMakeLists.txt	2015-07-19 23:36:15.873381224 +0200
@@ -1,12 +1,5 @@
 project(libshiboken)
 
-option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
-if(ENABLE_VERSION_SUFFIX)
-    set(shiboken_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
-else()
-    set(shiboken_SUFFIX "")
-endif()
-
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in"
                "${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h" @ONLY)
 
diff -Naur shiboken-1.2.2/shibokenmodule/CMakeLists.txt shiboken-1.2.2_fixed/shibokenmodule/CMakeLists.txt
--- shiboken-1.2.2/shibokenmodule/CMakeLists.txt	2014-04-22 17:42:48.000000000 +0200
+++ shiboken-1.2.2_fixed/shibokenmodule/CMakeLists.txt	2015-07-19 23:36:15.873381224 +0200
@@ -9,7 +9,7 @@
 )
 
 add_custom_command(OUTPUT ${sample_SRC}
-COMMAND ${shibokengenerator_BINARY_DIR}/shiboken --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
+COMMAND ${shibokengenerator_BINARY_DIR}/shiboken${shiboken_SUFFIX} --project-file=${CMAKE_CURRENT_BINARY_DIR}/shibokenmodule.txt ${GENERATOR_EXTRA_FLAGS}
 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 COMMENT "Running generator for 'shiboken'..."
 )

Places

File shiboken-fix-include-with-suffix.patch of Package python-pyside-shiboken (Revision 6524cce0f981aa14372d94597ec4fc83)

Places