mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 02:22:13 +08:00
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
diff --git a/data/ShibokenConfig.cmake.in b/data/ShibokenConfig.cmake.in
|
|
index 7d8bc86..7155469 100644
|
|
--- a/data/ShibokenConfig.cmake.in
|
|
+++ b/data/ShibokenConfig.cmake.in
|
|
@@ -2,4 +2,4 @@ if (NOT PYTHON_SUFFIX)
|
|
message(STATUS "Using default python: @PYTHON_SUFFIX@")
|
|
SET(PYTHON_SUFFIX @PYTHON_SUFFIX@)
|
|
endif()
|
|
-include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
|
|
+include(@LIB_INSTALL_DIR@/cmake/Shiboken@shiboken_SUFFIX@-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
|
|
diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
|
|
index 884a178..c5888a3 100644
|
|
--- a/data/shiboken.pc.in
|
|
+++ b/data/shiboken.pc.in
|
|
@@ -1,12 +1,12 @@
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
exec_prefix=@CMAKE_INSTALL_PREFIX@
|
|
libdir=@LIB_INSTALL_DIR@
|
|
-includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
|
|
+includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@
|
|
generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@
|
|
python_interpreter=@PYTHON_EXECUTABLE@
|
|
python_include_dir=@SBK_PYTHON_INCLUDE_DIR@
|
|
|
|
-Name: shiboken
|
|
+Name: shiboken@shiboken_SUFFIX@
|
|
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@
|
|
diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt
|
|
index feb8498..f2a1c1d 100644
|
|
--- a/libshiboken/CMakeLists.txt
|
|
+++ b/libshiboken/CMakeLists.txt
|
|
@@ -3,9 +3,13 @@ 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 "")
|
|
+# begin: arsooy_ changes
|
|
+# we need to prevent shiboken_SUFFIX to empty because we use it (its value
|
|
+# provided by our PKGBUILD) to build libshiboken to work with Python 3.
|
|
+#else()
|
|
+# set(shiboken_SUFFIX "")
|
|
endif()
|
|
+# end: arsooy_ changes
|
|
|
|
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h" @ONLY)
|