1 From 83f364a2eb1b137453772ae9fcf5d7973770637f Mon Sep 17 00:00:00 2001
2 From: Billy Robert O'Neal III <bion@microsoft.com>
3 Date: Wed, 29 Apr 2020 13:01:31 -0700
4 Subject: [PATCH] Don't install 'LICENSE' or 'README.md' directly to the
5 installation directory.
7 This change unconditionally uses GNUInstallDirs which will correctly 'namespace' these files with the 'argh' project name.
11 The names 'LICENSE' and 'README.md' are extremely common and likely to be taken by other ports. This happened in a recent full vcpkg catalog rebuild:
13 Starting package 757/1254: qt-advanced-docking-system:x86-windows
14 Building package qt-advanced-docking-system[core]:x86-windows...
15 Could not locate cached archive: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip
16 -- Downloading https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz...
17 -- Extracting source C:/agent/_work/1/s/downloads/githubuser0xFFFF-Qt-Advanced-Docking-System-661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz
18 -- Applying patch config_changes.patch
19 -- Using source at C:/agent/_work/1/s/buildtrees/qt-advanced-docking-system/src/bab86dad13-3088149a9b
20 -- Configuring x86-windows
21 -- Building x86-windows-dbg
22 -- Building x86-windows-rel
23 -- Installing: C:/agent/_work/1/s/packages/qt-advanced-docking-system_x86-windows/share/qt-advanced-docking-system/copyright
24 -- Performing post-build validation
25 -- Performing post-build validation done
26 Stored binary cache: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip
27 Building package qt-advanced-docking-system[core]:x86-windows... done
28 Installing package qt-advanced-docking-system[core]:x86-windows...
29 The following files are already installed in C:/agent/_work/1/s/installed/x86-windows and are in conflict with qt-advanced-docking-system:x86-windows
31 Installed by argh:x86-windows
34 Elapsed time for package qt-advanced-docking-system:x86-windows: 11.09 s
36 CMakeLists.txt | 12 +++++-------
37 1 file changed, 5 insertions(+), 7 deletions(-)
39 diff --git a/CMakeLists.txt b/CMakeLists.txt
40 index 13bc879..f6264f3 100644
43 @@ -36,19 +36,17 @@ endif()
45 install(TARGETS argh EXPORT arghTargets)
47 +include(GNUInstallDirs)
48 +install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
49 +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR})
50 +install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR})
52 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
53 # this might be a bit too restrictive, since for other (BSD, ...) this might apply also
54 # but this can be fixed later in extra pull requests from people on the platform
55 - include(GNUInstallDirs)
56 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
57 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR})
58 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR})
59 install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
60 install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh)
62 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include)
63 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license)
64 - install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .)
65 install(FILES argh-config.cmake DESTINATION CMake)
66 install(EXPORT arghTargets DESTINATION CMake)