diff options
| author | hesiod <tobias@miglix.eu> | 2018-10-16 03:02:05 +0100 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-15 19:02:05 -0700 |
| commit | 4568b57ad7728f30c1e2badc9735c8990cd51265 (patch) | |
| tree | 598649e65895436fe2ab1fd40644491d32b51676 /ports/globjects/system-install.patch | |
| parent | 9bc8ed32d196a04f352ce09a7121b18ba7f8f6f9 (diff) | |
| download | vcpkg-4568b57ad7728f30c1e2badc9735c8990cd51265.tar.gz vcpkg-4568b57ad7728f30c1e2badc9735c8990cd51265.zip | |
[glbinding] Update to v3.0.2 (#4405)
* Update glbinding to v3.0.2
Because glbinding introduced a new auxiliary library glbinding-aux the
CMake export/config file organization had to be changed.
* [glbinding] Simplify targets handling. General port cleanup. Force system-style install on all platforms.
* [glbinding] Fix glbinding-config.cmake
* [globjects] Pin forward to handle changes in glbinding 3.x
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
|