diff --git a/cmake/Python/PySide2ModuleBuild.cmake b/cmake/Python/PySide2ModuleBuild.cmake index 8fcd4c7f..9f08eb7e 100644 --- a/cmake/Python/PySide2ModuleBuild.cmake +++ b/cmake/Python/PySide2ModuleBuild.cmake @@ -11,7 +11,7 @@ if (NOT ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX) SET(${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE FILEPATH "Custom path to install python bindings.") endif() -message(STATUS "PYTHON INSTALL PREFIX ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}") +message(STATUS "PYTHON INSTALL PREFIX ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}") if (WIN32) set(PATH_SEP "\;") @@ -153,5 +153,5 @@ macro(CREATE_PYTHON_BINDINGS LINK_FLAGS "-undefined dynamic_lookup") endif() install(TARGETS ${TARGET_NAME} - LIBRARY DESTINATION ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}/${TARGET_NAME}) + LIBRARY DESTINATION ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}/${TARGET_NAME}) endmacro() diff --git a/python/PyKDDockWidgets/CMakeLists.txt b/python/PyKDDockWidgets/CMakeLists.txt index 6d9a6a15..fcbb7311 100644 --- a/python/PyKDDockWidgets/CMakeLists.txt +++ b/python/PyKDDockWidgets/CMakeLists.txt @@ -74,8 +74,8 @@ create_python_bindings( ${CMAKE_CURRENT_BINARY_DIR} ) -# Make moduled import from build dir works +# Make module import from build dir work configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py ${CMAKE_CURRENT_BINARY_DIR}/__init__.py) # install -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}/PyKDDockWidgets) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION ${${PROJECT_NAME}_PYTHON_BINDINGS_INSTALL_PREFIX}/PyKDDockWidgets) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 74c3eebe..6dc396ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,7 +180,11 @@ elseif(NOT APPLE) target_link_libraries(kddockwidgets PUBLIC Qt5::X11Extras) endif() -set_target_properties(kddockwidgets PROPERTIES VERSION ${${PROJECT_NAME}_SOVERSION}) +set_target_properties(kddockwidgets PROPERTIES + SOVERSION ${${PROJECT_NAME}_SOVERSION} + VERSION ${${PROJECT_NAME}_VERSION} +) + #version libraries on Windows if(WIN32) set(postfix ${${PROJECT_NAME}_VERSION_MAJOR}) diff --git a/src/private/multisplitter/CMakeLists.txt b/src/private/multisplitter/CMakeLists.txt index 9cd42be9..5648d52c 100644 --- a/src/private/multisplitter/CMakeLists.txt +++ b/src/private/multisplitter/CMakeLists.txt @@ -98,7 +98,11 @@ target_include_directories(kddockwidgets_multisplitter ${CMAKE_CURRENT_SOURCE_DIR} ) -set_target_properties(kddockwidgets_multisplitter PROPERTIES VERSION ${${PROJECT_NAME}_SOVERSION}) +set_target_properties(kddockwidgets_multisplitter PROPERTIES + SOVERSION ${${PROJECT_NAME}_SOVERSION} + VERSION ${${PROJECT_NAME}_VERSION} +) + #version libraries on Windows if(WIN32) set(postfix ${${PROJECT_NAME}_VERSION_MAJOR})