mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 11:39:01 +08:00
[qt-advanced-docking-system] updated qt-advanced-docking-system to 3.2.1 (#10170)
* updated qt-advanced-docking-system to 3.2.1 * fixed source hash * made requested changes * fix linux build * Update to 3.2.5, fix hash discrepancy
This commit is contained in:
parent
ff32240ab4
commit
657becf609
@ -1,4 +1,5 @@
|
||||
Source: qt-advanced-docking-system
|
||||
Version: 2019-08-14-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
|
||||
Source: qt-advanced-docking-system
|
||||
Version: 3.2.5
|
||||
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
|
||||
Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
|
@ -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")
|
||||
@@ -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
|
||||
|
@ -1,10 +1,8 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO githubuser0xFFFF/Qt-Advanced-Docking-System
|
||||
REF a2b07fd97f0fac63fd7a0ed7b1eb0692b3efab71
|
||||
SHA512 a44babd6100f299aea7fcf2d730874e204151ce363e1f58a2be938f70d28b07f3cb39adfbf46527fdacc3b12a630e7d97851e4a6fcd04e750a007ee06d06d3b5
|
||||
REF 661d0c4356ab61d155b53718aa1bf6bab86dad13
|
||||
SHA512 3504d91b63cc68abbc56e935f22dda2e5b667400501b547a159e3e43d5862c2cff5739423606732361b331b00596202a19a67c3273948cccfbdb8593970cb840
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
config_changes.patch
|
||||
@ -18,8 +16,8 @@ vcpkg_configure_cmake(
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt-advanced-docking-system RENAME copyright)
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license)
|
||||
vcpkg_fixup_cmake_targets()
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
Loading…
Reference in New Issue
Block a user