diff options
| author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-03-13 16:21:05 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-03-13 15:34:47 +0000 |
| commit | d30161e81f6d2c3cc95c6ced2d5248de56f7eedc (patch) | |
| tree | 5eca2286a110aa49d8c2a1aad99c9729a3e302c5 /examples/scriptableapplication | |
| parent | 14d40938c43ba68f776bc80af82d8a5c0ee563d9 (diff) | |
Fix scriptableapplication build on Windows
CMake failed to find shiboken2 binary (without .exe).
The configuration script was unable to get information
from the LIBDIR variable, since it is not set
automatically on Windows, using LIBDEST if that
is the case.
Task-number: PYSIDE-627
Change-Id: Id8031891a2da98af33b81b0740e25299828d6fb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples/scriptableapplication')
| -rw-r--r-- | examples/scriptableapplication/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/scriptableapplication/pyside2_config.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/examples/scriptableapplication/CMakeLists.txt b/examples/scriptableapplication/CMakeLists.txt index 6641d77c6..368fd7d25 100644 --- a/examples/scriptableapplication/CMakeLists.txt +++ b/examples/scriptableapplication/CMakeLists.txt @@ -37,7 +37,7 @@ endmacro() # Get relevant general paths, include paths and linker flags. pyside2_config(--pyside2 PYSIDE2_PATH) -set(SHIBOKEN_PATH "${PYSIDE2_PATH}/shiboken2") +set(SHIBOKEN_PATH "${PYSIDE2_PATH}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}") if(NOT EXISTS ${SHIBOKEN_PATH}) message(FATAL_ERROR "Shiboken executable not found at path: ${SHIBOKEN_PATH}") diff --git a/examples/scriptableapplication/pyside2_config.py b/examples/scriptableapplication/pyside2_config.py index 361043aef..0eba6cc23 100644 --- a/examples/scriptableapplication/pyside2_config.py +++ b/examples/scriptableapplication/pyside2_config.py @@ -125,6 +125,9 @@ def pythonLinkCmake(): def pythonLinkData(): # @TODO Fix to work with static builds of Python libdir = sysconfig.get_config_var('LIBDIR') + if libdir is None: + libdir = os.path.abspath(os.path.join( + sysconfig.get_config_var('LIBDEST'), "..", "libs")) version = pythonVersion() version_no_dots = version.replace('.', '') |