diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 07:51:22 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 09:34:35 +0000 |
| commit | 2a2a0827fa54b2eeb48e0e2090dfc503492ef33e (patch) | |
| tree | 4311f7ad34ff98fabcbe4c34e59a970ae4ff4bcf /examples/samplebinding | |
| parent | fb1c0f204e09ba29fa3d360d72231d4ed468c1e4 (diff) | |
Rename shiboken2 to shiboken6
Adapt CMake files, build scripts, tests and examples.
Task-number: PYSIDE-904
Change-Id: I4cb5ee4c8df539546014b08202a7b1e98ed3ff07
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'examples/samplebinding')
| -rw-r--r-- | examples/samplebinding/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | examples/samplebinding/README.md | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/samplebinding/CMakeLists.txt b/examples/samplebinding/CMakeLists.txt index f7651e04f..8a2e55d66 100644 --- a/examples/samplebinding/CMakeLists.txt +++ b/examples/samplebinding/CMakeLists.txt @@ -70,14 +70,14 @@ macro(pyside2_config option output_var) endmacro() # Query for the shiboken generator path, Python path, include paths and linker flags. -pyside2_config(--shiboken2-module-path shiboken2_module_path) -pyside2_config(--shiboken2-generator-path shiboken2_generator_path) +pyside2_config(--shiboken6-module-path shiboken6_module_path) +pyside2_config(--shiboken6-generator-path shiboken6_generator_path) pyside2_config(--python-include-path python_include_dir) -pyside2_config(--shiboken2-generator-include-path shiboken_include_dir 1) -pyside2_config(--shiboken2-module-shared-libraries-cmake shiboken_shared_libraries 0) +pyside2_config(--shiboken6-generator-include-path shiboken_include_dir 1) +pyside2_config(--shiboken6-module-shared-libraries-cmake shiboken_shared_libraries 0) pyside2_config(--python-link-flags-cmake python_linking_data 0) -set(shiboken_path "${shiboken2_generator_path}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}") +set(shiboken_path "${shiboken6_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}") if(NOT EXISTS ${shiboken_path}) message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}") endif() @@ -93,7 +93,7 @@ endif() # Enable rpaths so that the built shared libraries find their dependencies. set(CMAKE_SKIP_BUILD_RPATH FALSE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -set(CMAKE_INSTALL_RPATH ${shiboken2_module_path} ${CMAKE_CURRENT_SOURCE_DIR}) +set(CMAKE_INSTALL_RPATH ${shiboken6_module_path} ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # ============================================================================================= # !!! End of dubious section. diff --git a/examples/samplebinding/README.md b/examples/samplebinding/README.md index e84d1eff4..34f3568f2 100644 --- a/examples/samplebinding/README.md +++ b/examples/samplebinding/README.md @@ -139,7 +139,7 @@ For Windows you will also need: or all Debug). The build uses the `pyside2_config.py` file to configure the project -using the current PySide2/Shiboken2 installation. +using the current PySide2/Shiboken6 installation. ### Using CMake @@ -232,5 +232,5 @@ In practice this means the only supported configurations are: This is necessary because all the shared libraries in question have to link to the same C++ runtime library (`msvcrt.dll` or `msvcrtd.dll`). To make the example as self-contained as possible, the shared libraries -in use (`pyside2.dll`, `shiboken2.dll`) are hard-linked into the build +in use (`pyside2.dll`, `shiboken6.dll`) are hard-linked into the build folder of the application. |