diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-23 16:23:48 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-02-23 16:23:52 +0100 |
commit | 4917f84cfa8d526e34e3a6d2164ecf2e23eab408 (patch) | |
tree | 21b6fc428ab75e38d1cee031ef767ed38e443044 /sources/shiboken2 | |
parent | 32a2eb95758f7beb13b54053bfa97c9bc973b9f0 (diff) | |
parent | 784df63e6be7339df3872a56baf89ca81c7e7199 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: I5d1a4734e8f44785898ba62beaa0bdd2004fca22
Diffstat (limited to 'sources/shiboken2')
-rw-r--r-- | sources/shiboken2/CMakeLists.txt | 1 | ||||
-rw-r--r-- | sources/shiboken2/data/Shiboken2Config-spec.cmake.in | 1 | ||||
-rw-r--r-- | sources/shiboken2/libshiboken/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/sources/shiboken2/CMakeLists.txt b/sources/shiboken2/CMakeLists.txt index b9dd0a7f9..006924ad9 100644 --- a/sources/shiboken2/CMakeLists.txt +++ b/sources/shiboken2/CMakeLists.txt @@ -15,6 +15,7 @@ set(shiboken_MAJOR_VERSION "2") set(shiboken_MINOR_VERSION "0") set(shiboken_MICRO_VERSION "0") set(shiboken2_VERSION "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}.${shiboken_MICRO_VERSION}") +set(shiboken2_library_so_version "${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}") option(BUILD_TESTS "Build tests." TRUE) option(USE_PYTHON_VERSION "Use specific python version to build shiboken2." "") diff --git a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in b/sources/shiboken2/data/Shiboken2Config-spec.cmake.in index 9a30d7b4d..576bed0e2 100644 --- a/sources/shiboken2/data/Shiboken2Config-spec.cmake.in +++ b/sources/shiboken2/data/Shiboken2Config-spec.cmake.in @@ -25,6 +25,7 @@ SET(SHIBOKEN_PYTHON_LIBRARIES "@SBK_PYTHON_LIBRARIES@") SET(SHIBOKEN_PYTHON_EXTENSION_SUFFIX "@PYTHON_EXTENSION_SUFFIX@") SET(SHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX "@PYTHON_SHARED_LIBRARY_SUFFIX@") SET(SHIBOKEN_PYTHON_CONFIG_SUFFIX "@PYTHON_CONFIG_SUFFIX@") +SET(SHIBOKEN_SO_VERSION "@shiboken2_library_so_version@") message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@") @SBK_ADD_PY_DEBUG_DEFINITION@ diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken2/libshiboken/CMakeLists.txt index 90b44aa76..e87cf07fd 100644 --- a/sources/shiboken2/libshiboken/CMakeLists.txt +++ b/sources/shiboken2/libshiboken/CMakeLists.txt @@ -31,7 +31,7 @@ set(libshiboken_MAJOR_VERSION ${shiboken_MAJOR_VERSION}) set(libshiboken_MINOR_VERSION ${shiboken_MINOR_VERSION}) set(libshiboken_MICRO_VERSION ${shiboken_MICRO_VERSION}) set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}.${libshiboken_MICRO_VERSION}") -set(libshiboken_SOVERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSION}") +set(libshiboken_SOVERSION "${shiboken2_library_so_version}") set(libshiboken_SRC basewrapper.cpp |