diff options
| author | Phoebe <925731795@qq.com> | 2019-09-11 01:46:47 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-09-10 10:46:47 -0700 |
| commit | dce685696ae8450c6cf6c801012feeecc1d3119d (patch) | |
| tree | c2a2321c72de2e1f8ffabc224abe090a39bdc71d | |
| parent | 97384c5f510f85a6a2a9baaa95860bd0bde87764 (diff) | |
| download | vcpkg-dce685696ae8450c6cf6c801012feeecc1d3119d.tar.gz vcpkg-dce685696ae8450c6cf6c801012feeecc1d3119d.zip | |
[glfw3] fix cmake config (#7592)
* [glfw3] fix cmake config
* Update patch
| -rw-r--r-- | ports/glfw3/fix-config.patch | 24 | ||||
| -rw-r--r-- | ports/glfw3/portfile.cmake | 4 |
2 files changed, 27 insertions, 1 deletions
diff --git a/ports/glfw3/fix-config.patch b/ports/glfw3/fix-config.patch new file mode 100644 index 000000000..181d7d91b --- /dev/null +++ b/ports/glfw3/fix-config.patch @@ -0,0 +1,24 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c0f625..0c985cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,7 +319,8 @@ set(GLFW_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/glfw3")
+ configure_package_config_file(src/glfw3Config.cmake.in
+ src/glfw3Config.cmake
+ INSTALL_DESTINATION "${GLFW_CONFIG_PATH}"
+- NO_CHECK_REQUIRED_COMPONENTS_MACRO)
++ NO_CHECK_REQUIRED_COMPONENTS_MACRO
++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
+
+ write_basic_package_version_file(src/glfw3ConfigVersion.cmake
+ VERSION ${GLFW_VERSION_FULL}
+diff --git a/src/glfw3Config.cmake.in b/src/glfw3Config.cmake.in
+index 1fa200e..861df93 100644
+--- a/src/glfw3Config.cmake.in
++++ b/src/glfw3Config.cmake.in
+@@ -1 +1,5 @@
++@PACKAGE_INIT@
++
++set_and_check(glfw_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
++
+ include("${CMAKE_CURRENT_LIST_DIR}/glfw3Targets.cmake")
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index ae4cbabef..0ef2d50ba 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF 3.3 SHA512 e74bb7ba0c1c3a524a193c4fb5a2d13ba0e75f8e309612ea19cdcc944859d6e2fe29d8b2e3db76236e1011b637564ddd5f4a176dcccfeb84d09bda060f08f774 HEAD_REF master - PATCHES move-cmake-min-req.patch + PATCHES + move-cmake-min-req.patch + fix-config.patch ) if(NOT VCPKG_TARGET_IS_WINDOWS) |