diff options
| author | Christian Tismer <ctismer@gmail.com> | 2015-09-21 11:52:00 +0200 |
|---|---|---|
| committer | Christian Tismer <ctismer@gmail.com> | 2015-09-21 11:52:00 +0200 |
| commit | b348f2e6038ea2635938b20e99130aa7984c3da0 (patch) | |
| tree | cea7eeed5c142f2c20547b1413249d068523f901 /libshiboken | |
| parent | aec629295a7470396432cfbf8175e3020949904f (diff) | |
huge change on project layout.
The intention is to have PySide2 and Shiboken2 as project names, to
allow for co-existence of PySide and PySide2.
This is the first version that builds with these settings on OS X:
$ python3 setup.py build --debug --no-examples --ignore-git --qmake=/usr/local/Cellar/qt5/5.5.0/bin/qmake --jobs=9
This is not yet tested.
Diffstat (limited to 'libshiboken')
| -rw-r--r-- | libshiboken/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libshiboken/CMakeLists.txt b/libshiboken/CMakeLists.txt index c8575e737..2b5a00c65 100644 --- a/libshiboken/CMakeLists.txt +++ b/libshiboken/CMakeLists.txt @@ -2,9 +2,9 @@ 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}") + set(shiboken2_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}") else() - set(shiboken_SUFFIX "") + set(shiboken2_SUFFIX "") endif() configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in" @@ -45,7 +45,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SPARSEHASH_INCLUDE_PATH}) add_library(libshiboken SHARED ${libshiboken_SRC}) target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES}) -set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken${shiboken_SUFFIX}${PYTHON_SUFFIX}" +set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken2${shiboken2_SUFFIX}${PYTHON_SUFFIX}" VERSION ${libshiboken_VERSION} SOVERSION ${libshiboken_SOVERSION} DEFINE_SYMBOL LIBSHIBOKEN_EXPORTS) @@ -70,8 +70,8 @@ install(FILES shibokenbuffer.h sbkpython.h "${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h" - DESTINATION include/shiboken${shiboken_SUFFIX}) -install(TARGETS libshiboken EXPORT shiboken + DESTINATION include/shiboken2${shiboken2_SUFFIX}) +install(TARGETS libshiboken EXPORT shiboken2 LIBRARY DESTINATION "${LIB_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" RUNTIME DESTINATION bin) |