diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-03-01 16:28:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 16:28:05 -0800 |
| commit | 307ac18b08e4125d3c521a86b7d7b317629be277 (patch) | |
| tree | b4fc0fe2351ddfd81e3fee7a8ee2c33f4a309156 | |
| parent | f9763b717eba12be38ea750406fe2a22a7ff00f6 (diff) | |
| download | vcpkg-307ac18b08e4125d3c521a86b7d7b317629be277.tar.gz vcpkg-307ac18b08e4125d3c521a86b7d7b317629be277.zip | |
[glm] Add namespace to export target (#16429)
* [glm] Add namespace to export target
* update version record
* [globjects] Fix dependency glm
* update version record
| -rw-r--r-- | ports/glm/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/glm/CONTROL | 4 | ||||
| -rw-r--r-- | ports/glm/vcpkg.json | 7 | ||||
| -rw-r--r-- | ports/globjects/CONTROL | 5 | ||||
| -rw-r--r-- | ports/globjects/fix-dependency-glm.patch | 13 | ||||
| -rw-r--r-- | ports/globjects/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/globjects/vcpkg.json | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 6 | ||||
| -rw-r--r-- | versions/g-/glm.json | 5 | ||||
| -rw-r--r-- | versions/g-/globjects.json | 5 |
10 files changed, 50 insertions, 14 deletions
diff --git a/ports/glm/CMakeLists.txt b/ports/glm/CMakeLists.txt index 678604b86..c8a92c151 100644 --- a/ports/glm/CMakeLists.txt +++ b/ports/glm/CMakeLists.txt @@ -15,7 +15,9 @@ install( )
install(
- EXPORT glm-config DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
+ EXPORT glm-config
+ NAMESPACE glm::
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
)
install(
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL deleted file mode 100644 index 3ba2f552d..000000000 --- a/ports/glm/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: glm -Version: 0.9.9.8 -Description: OpenGL Mathematics (GLM) -Homepage: https://glm.g-truc.net diff --git a/ports/glm/vcpkg.json b/ports/glm/vcpkg.json new file mode 100644 index 000000000..45a3b3c71 --- /dev/null +++ b/ports/glm/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "glm", + "version-string": "0.9.9.8", + "port-version": 1, + "description": "OpenGL Mathematics (GLM)", + "homepage": "https://glm.g-truc.net" +} diff --git a/ports/globjects/CONTROL b/ports/globjects/CONTROL deleted file mode 100644 index 64664a9a1..000000000 --- a/ports/globjects/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: globjects -Version: 1.1.0-3 -Build-Depends: glbinding, glm -Description: C++ library strictly wrapping OpenGL objects. -Homepage: https://github.com/cginternals/globjects diff --git a/ports/globjects/fix-dependency-glm.patch b/ports/globjects/fix-dependency-glm.patch new file mode 100644 index 000000000..e867da1b1 --- /dev/null +++ b/ports/globjects/fix-dependency-glm.patch @@ -0,0 +1,13 @@ +diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt +index 71e92d8..b8b4408 100644 +--- a/source/globjects/CMakeLists.txt ++++ b/source/globjects/CMakeLists.txt +@@ -359,7 +359,7 @@ target_link_libraries(${target} + + PUBLIC + ${DEFAULT_LIBRARIES} +- glm ++ glm::glm + glbinding::glbinding + glbinding::glbinding-aux + diff --git a/ports/globjects/portfile.cmake b/ports/globjects/portfile.cmake index 12ef30059..4103fd3ab 100644 --- a/ports/globjects/portfile.cmake +++ b/ports/globjects/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500 HEAD_REF master - PATCHES system-install.patch + PATCHES + system-install.patch + fix-dependency-glm.patch ) vcpkg_configure_cmake( diff --git a/ports/globjects/vcpkg.json b/ports/globjects/vcpkg.json new file mode 100644 index 000000000..8878d2865 --- /dev/null +++ b/ports/globjects/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "globjects", + "version-string": "1.1.0", + "port-version": 4, + "description": "C++ library strictly wrapping OpenGL objects", + "homepage": "https://github.com/cginternals/globjects", + "dependencies": [ + "glbinding", + "glm" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c30c98480..a10c6d6a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2230,11 +2230,11 @@ }, "glm": { "baseline": "0.9.9.8", - "port-version": 0 + "port-version": 1 }, "globjects": { - "baseline": "1.1.0-3", - "port-version": 0 + "baseline": "1.1.0", + "port-version": 4 }, "glog": { "baseline": "0.4.0-3", diff --git a/versions/g-/glm.json b/versions/g-/glm.json index e1a52539f..e7873160a 100644 --- a/versions/g-/glm.json +++ b/versions/g-/glm.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4aafac80f39a72fadaf6a31afb961790678062de", + "version-string": "0.9.9.8", + "port-version": 1 + }, + { "git-tree": "14a7c57c30809e4f4c953dd60fa335bb194d0be5", "version-string": "0.9.9.8", "port-version": 0 diff --git a/versions/g-/globjects.json b/versions/g-/globjects.json index 75d9b7d96..75340cf93 100644 --- a/versions/g-/globjects.json +++ b/versions/g-/globjects.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "0d9e98af47d7eb383a98e39c5661e573b1197e8c", + "version-string": "1.1.0", + "port-version": 4 + }, + { "git-tree": "b2e73ec8949205afcdcf9c8b7f5e536275f0ed19", "version-string": "1.1.0-3", "port-version": 0 |