-
Notifications
You must be signed in to change notification settings - Fork 7.1k
[qt-advanced-docking-system] updated qt-advanced-docking-system to 3.2.1 #10170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f90131c
updated qt-advanced-docking-system to 3.2.1
stijnherfst 5153a4d
fixed source hash
stijnherfst 8b7f4dd
made requested changes
stijnherfst 28d155a
fix linux build
stijnherfst 5251ee9
Update to 3.2.5, fix hash discrepancy
stijnherfst a9c83ba
Merge branch 'master' into master
stijnherfst File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Source: qt-advanced-docking-system | ||
Version: 2019-08-14 | ||
Version: 3.2.1 | ||
Build-Depends: qt5-base, zlib, bzip2 | ||
Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,36 +1,47 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 8a9f919..9c2b8ad 100644 | ||
index 578dfc1..a4c9460 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -62,7 +62,7 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") | ||
+++ b/CMakeLists.txt | ||
@@ -70,7 +70,7 @@ if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") | ||
else() | ||
set(ads_PlatformDir "x64") | ||
endif() | ||
-if(BUILD_STATIC) | ||
+if(NOT BUILD_SHARED_LIBS) | ||
add_library(qtadvanceddocking STATIC ${ads_SRCS}) | ||
set(ads_COMPILE_DEFINE ${ads_COMPILE_DEFINE} ADS_STATIC) | ||
target_compile_definitions(qtadvanceddocking PUBLIC ADS_STATIC) | ||
else() | ||
@@ -80,7 +80,7 @@ install(FILES | ||
@@ -88,7 +88,7 @@ install(FILES | ||
COMPONENT license | ||
) | ||
install(TARGETS qtadvanceddocking | ||
- EXPORT adsBinary | ||
- EXPORT adsTargets | ||
+ EXPORT qt-advanced-docking-systemConfig | ||
RUNTIME DESTINATION bin COMPONENT library | ||
LIBRARY DESTINATION lib COMPONENT library | ||
ARCHIVE DESTINATION lib COMPONENT library | ||
@@ -93,7 +93,6 @@ target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS}) | ||
RUNTIME DESTINATION bin | ||
LIBRARY DESTINATION lib | ||
ARCHIVE DESTINATION lib | ||
@@ -100,14 +100,8 @@ write_basic_package_version_file("adsConfigVersion.cmake" | ||
VERSION ${ads_VERSION} | ||
COMPATIBILITY SameMajorVersion | ||
) | ||
-install(EXPORT adsTargets | ||
- FILE adsTargets.cmake | ||
- NAMESPACE ads:: | ||
- DESTINATION lib/cmake/ads | ||
-) | ||
-install(FILES "adsConfig.cmake" "${CMAKE_BINARY_DIR}/adsConfigVersion.cmake" | ||
- DESTINATION lib/cmake/ads | ||
-) | ||
+ | ||
+install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) | ||
|
||
target_include_directories(qtadvanceddocking PUBLIC | ||
"$<BUILD_INTERFACE:${ads_INCLUDE}>" | ||
@@ -117,7 +111,6 @@ target_link_libraries(qtadvanceddocking PUBLIC ${ads_LIBS}) | ||
target_compile_definitions(qtadvanceddocking PRIVATE ${ads_COMPILE_DEFINE}) | ||
set_target_properties(qtadvanceddocking PROPERTIES | ||
VERSION ${ads_VERSION} | ||
- EXPORT_NAME "Qt Advanced Docking System" | ||
- EXPORT_NAME "QtAdvancedDockingSystem" | ||
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" | ||
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/lib" | ||
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${ads_PlatformDir}/bin" | ||
@@ -103,3 +102,4 @@ if(BUILD_EXAMPLES) | ||
add_subdirectory(demo) | ||
endif() | ||
|
||
+install(EXPORT qt-advanced-docking-systemConfig NAMESPACE qt-advanced-docking-system:: DESTINATION share/qt-advanced-docking-system) | ||
\ No newline at end of file |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.