aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilly Robert O'Neal III <bion@microsoft.com>2020-04-29 13:39:22 -0700
committerBilly O'Neal <billy.oneal@gmail.com>2020-04-30 21:51:31 -0700
commit85c3904a652faa0080f40cf732c3b35318e20883 (patch)
tree9b4267fedda095e49321b46488c5dc5ccc43ef1e
parent44933d7ebcd450de0407814d2c84bb16adf1786a (diff)
downloadvcpkg-85c3904a652faa0080f40cf732c3b35318e20883.tar.gz
vcpkg-85c3904a652faa0080f40cf732c3b35318e20883.zip
[qt-advanced-docking-system] Patch qt-advanced-docking-system to not install LICENSE.
-rw-r--r--ports/qt-advanced-docking-system/CONTROL4
-rw-r--r--ports/qt-advanced-docking-system/portfile.cmake2
-rw-r--r--ports/qt-advanced-docking-system/skip_license_install.patch19
3 files changed, 23 insertions, 2 deletions
diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL
index 9b1dda81b..478551458 100644
--- a/ports/qt-advanced-docking-system/CONTROL
+++ b/ports/qt-advanced-docking-system/CONTROL
@@ -1,5 +1,5 @@
Source: qt-advanced-docking-system
-Version: 3.2.5
+Version: 3.2.5-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
-Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System \ No newline at end of file
+Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
diff --git a/ports/qt-advanced-docking-system/portfile.cmake b/ports/qt-advanced-docking-system/portfile.cmake
index 3f9577df9..dd70c21e2 100644
--- a/ports/qt-advanced-docking-system/portfile.cmake
+++ b/ports/qt-advanced-docking-system/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
HEAD_REF master
PATCHES
config_changes.patch
+ skip_license_install.patch
)
vcpkg_configure_cmake(
@@ -17,6 +18,7 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/gnu-lgpl-v2.1.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/license)
vcpkg_fixup_cmake_targets()
diff --git a/ports/qt-advanced-docking-system/skip_license_install.patch b/ports/qt-advanced-docking-system/skip_license_install.patch
new file mode 100644
index 000000000..e6cfb32a5
--- /dev/null
+++ b/ports/qt-advanced-docking-system/skip_license_install.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a2cb47d..57a1cf5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -81,14 +81,8 @@ install(FILES ${ads_INSTALL_INCLUDE}
+ DESTINATION include
+ COMPONENT headers
+ )
+-install(FILES
+- "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
+- "${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md"
+- DESTINATION license
+- COMPONENT license
+-)
+ install(TARGETS qtadvanceddocking
+ EXPORT qt-advanced-docking-systemConfig
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib