diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/globjects/system-install.patch | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/globjects/system-install.patch')
| -rw-r--r-- | ports/globjects/system-install.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/ports/globjects/system-install.patch b/ports/globjects/system-install.patch new file mode 100644 index 000000000..10e0c5b49 --- /dev/null +++ b/ports/globjects/system-install.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6556346..48ba95d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake)
+ #
+
+ # Get git revision
++if(NOT DEFINED GIT_REV)
+ get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+ string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
+ if(NOT GIT_SHA1)
+ set(GIT_REV "0")
+ endif()
++endif()
+
+ # Meta information about the project
+ set(META_PROJECT_NAME "globjects")
+@@ -133,7 +135,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
+ endif()
+
+ # Installation paths
+-if(UNIX AND SYSTEM_DIR_INSTALL)
++if(1)
+ # Install into the system (/usr/bin or /usr/local/bin)
+ set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
+ set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
|