mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 23:51:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System

Browse Source
This commit is contained in:
Uwe Kindler 2020-06-26 11:19:58 +02:00
commit ace6d69695
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -141,7 +141,7 @@ Normally clicking the close button of a dock widget will just hide the widget an
### Python PyQt5 Bindings ### Python PyQt5 Bindings
<img src="doc/python_logo.png" height="140"> ![Python Logo](doc/python_logo.png)
The Advanced Docking System comes with a complete Python integration based on 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 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) - [Hugo Slepicka](https://github.com/hhslepicka)
- [K Lauer](https://github.com/klauer) - [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 ## Tested Compatible Environments

12
src/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(ads_SRCS
DockComponentsFactory.cpp DockComponentsFactory.cpp
ads.qrc ads.qrc
) )
set(ads_INSTALL_INCLUDE set(ads_HEADERS
ads_globals.h ads_globals.h
DockAreaTabBar.h DockAreaTabBar.h
DockAreaTitleBar.h DockAreaTitleBar.h
@ -47,13 +47,13 @@ set(ads_INSTALL_INCLUDE
) )
if (UNIX) if (UNIX)
set(ads_SRCS linux/FloatingWidgetTitleBar.cpp ${ads_SRCS}) 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() endif()
if(BUILD_STATIC) if(BUILD_STATIC)
add_library(qtadvanceddocking STATIC ${ads_SRCS}) add_library(qtadvanceddocking STATIC ${ads_SRCS} ${ads_HEADERS})
target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC)
else() else()
add_library(qtadvanceddocking SHARED ${ads_SRCS}) add_library(qtadvanceddocking SHARED ${ads_SRCS} ${ads_HEADERS})
target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT) target_compile_definitions(qtadvanceddocking PRIVATE ADS_SHARED_EXPORT)
endif() endif()
target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets) target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
@ -75,7 +75,7 @@ write_basic_package_version_file(
VERSION ${VERSION_SHORT} VERSION ${VERSION_SHORT}
COMPATIBILITY SameMajorVersion COMPATIBILITY SameMajorVersion
) )
install(FILES ${ads_INSTALL_INCLUDE} install(FILES ${ads_HEADERS}
DESTINATION include DESTINATION include
COMPONENT headers COMPONENT headers
) )
@ -104,5 +104,5 @@ install(FILES qtadvanceddockingConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/qtadvan
target_include_directories(qtadvanceddocking PUBLIC target_include_directories(qtadvanceddocking PUBLIC
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
) )