From 59d6a640984e3c12fcb28743b86943e23bda1eff Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Thu, 18 Jun 2020 09:31:14 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fbfbb70..869eaad 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Normally clicking the close button of a dock widget will just hide the widget an ### Python PyQt5 Bindings - +![Python Logo](doc/python_logo.png) The Advanced Docking System comes with a complete Python integration based on PyQt5 bindings. The package is available via [conda-forge](https://github.com/conda-forge/pyqtads-feedstock). The python integration has been contributed to this project @@ -151,7 +151,7 @@ by the following people: - [Hugo Slepicka](https://github.com/hhslepicka) - [K Lauer](https://github.com/klauer) -Latest working version: [3.4.2](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.4.2) +Latest working version: [3.5.1](https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/releases/tag/3.5.1) ## Tested Compatible Environments From 50c4a8ed484dbad033e66294568e3960b18bd23a Mon Sep 17 00:00:00 2001 From: Nick D'Ademo Date: Sat, 20 Jun 2020 02:01:48 +0800 Subject: [PATCH 2/2] Update CMakeLists.txt (#204) Pass header files to add_library() so they appear in the 'qtadvanceddocking' Visual Studio project. Add path to header files in PUBLIC include build interface so the 'qtadvanceddocking' target can be built in-source in a CMake project. --- src/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0bae44..4531cc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,7 +25,7 @@ set(ads_SRCS DockComponentsFactory.cpp ads.qrc ) -set(ads_INSTALL_INCLUDE +set(ads_HEADERS ads_globals.h DockAreaTabBar.h DockAreaTitleBar.h @@ -47,13 +47,13 @@ set(ads_INSTALL_INCLUDE ) if (UNIX) set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) - set(ads_INSTALL_INCLUDE linux/FloatingWidgetTitleBar.h ${ads_INSTALL_INCLUDE}) + set(ads_HEADERS linux/FloatingWidgetTitleBar.h ${ads_HEADERS}) endif() if(BUILD_STATIC) - add_library(qtadvanceddocking STATIC ${ads_SRCS}) + add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS}) target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) else() - add_library(qtadvanceddocking SHARED ${ads_SRCS}) + add_library(qtadvanceddocking SHARED ${ads_SRCS} ${ads_HEADERS}) target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT) endif() target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets) @@ -75,7 +75,7 @@ write_basic_package_version_file( VERSION ${VERSION_SHORT} COMPATIBILITY SameMajorVersion ) -install(FILES ${ads_INSTALL_INCLUDE} +install(FILES ${ads_HEADERS} DESTINATION include COMPONENT headers ) @@ -104,5 +104,5 @@ install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvan target_include_directories(qtadvanceddocking PUBLIC $ + $ ) -