diff --git a/.gitignore b/.gitignore index 82ea16ba..f36ee3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,9 @@ kddockwidgets_minimal_example /CMakeDoxygenDefaults.cmake /Testing /layout_tst* +/x64 +/src/kddockwidgets_version.h +*.vcxproj* +*.sln +*.dir + diff --git a/CMakeLists.txt b/CMakeLists.txt index 125d9278..71f2016c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,15 +191,17 @@ if(${PROJECT_NAME}_PYTHON_BINDINGS) endif() # Generate .pri file for qmake users -include(ECMGeneratePriFile) -set(PROJECT_VERSION_STRING ${${PROJECT_NAME}_VERSION}) -ecm_generate_pri_file(BASE_NAME KDDockWidgets - LIB_NAME kddockwidgets - DEPS ${${PROJECT_NAME}_DEPS} - FILENAME_VAR pri_filename - INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} -) -install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +if (NOT CMAKE_CONFIGURATION_TYPES) # Not working with VS generator + include(ECMGeneratePriFile) + set(PROJECT_VERSION_STRING ${${PROJECT_NAME}_VERSION}) + ecm_generate_pri_file(BASE_NAME KDDockWidgets + LIB_NAME kddockwidgets + DEPS ${${PROJECT_NAME}_DEPS} + FILENAME_VAR pri_filename + INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} + ) + install(FILES ${pri_filename} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) +endif() install(FILES LICENSE.txt README.md DESTINATION ${INSTALL_DOC_DIR}) install(DIRECTORY LICENSES DESTINATION ${INSTALL_DOC_DIR}) diff --git a/Changelog b/Changelog index 50c8aeaa..85d2f7a4 100644 --- a/Changelog +++ b/Changelog @@ -14,6 +14,7 @@ - Fixed bug where last tab index position wouldn't be remembered in case user had manually reordered tabs (#154) - Fixed crash when hosting a QQuickWidget (#150) + - Fixed CMake Visual Studio generator not working * v1.2.1 (unreleased) - Support for resizing dock widgets when they are in overlay/popup mode (autohide/sidebar feature) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a592c55..ece0fa2e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -266,13 +266,18 @@ set_target_properties(kddockwidgets PROPERTIES #version libraries on Windows if(WIN32) - set(postfix ${${PROJECT_NAME}_VERSION_MAJOR}) - string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE) - if(${UPPER_BUILD_TYPE} MATCHES "^DEBUG") - string(CONCAT postfix ${postfix} "d") - set_target_properties(kddockwidgets PROPERTIES DEBUG_POSTFIX ${postfix}) - else() - set_target_properties(kddockwidgets PROPERTIES ${UPPER_BUILD_TYPE}_POSTFIX ${postfix}) + if (CMAKE_BUILD_TYPE) + set(postfix ${${PROJECT_NAME}_VERSION_MAJOR}) + string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE) + if(${UPPER_BUILD_TYPE} MATCHES "^DEBUG") + string(CONCAT postfix ${postfix} "d") + set_target_properties(kddockwidgets PROPERTIES DEBUG_POSTFIX ${postfix}) + else() + set_target_properties(kddockwidgets PROPERTIES ${UPPER_BUILD_TYPE}_POSTFIX ${postfix}) + endif() + elseif(CMAKE_CONFIGURATION_TYPES) + # Visual Studio generator + set_target_properties(kddockwidgets PROPERTIES DEBUG_POSTFIX d) endif() endif()