cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-27 21:20:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[glfw3] fix cmake config (#7592)

Browse Source 
* [glfw3] fix cmake config

* Update patch
This commit is contained in:
Phoebe 2019-09-11 01:46:47 +08:00 committed by dan-shaw
parent 97384c5f51
commit dce685696a
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/glfw3/fix-config.patch Normal file
View File

@ -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")

4
ports/glfw3/portfile.cmake
View File

@ -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)