[glfw3] Fix the name of the dynamic library under win in the pc file (#33991)

* Generate Imath.pc

* update version

* add dependency imath minizip-ng

* updata version

* update version

* Fix the name of the dynamic library under win in the pc file

* update version

* Fix the name of the dynamic library under win in the pc file

* update version
This commit is contained in:
jim wang 2023-11-29 17:36:07 +08:00 committed by GitHub
parent 848c8178ce
commit 4cac260c4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 2 deletions

View File

@ -0,0 +1,29 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7506916..1ec8e9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -333,6 +333,12 @@ write_basic_package_version_file(src/glfw3ConfigVersion.cmake
COMPATIBILITY SameMajorVersion)
configure_file(src/glfw_config.h.in src/glfw_config.h @ONLY)
+set(GLFW_LIB_NAME_SUFFIX "")
+if (BUILD_SHARED_LIBS)
+ if (WIN32)
+ set(GLFW_LIB_NAME_SUFFIX "dll")
+ endif()
+endif()
configure_file(src/glfw3.pc.in src/glfw3.pc @ONLY)
diff --git a/src/glfw3.pc.in b/src/glfw3.pc.in
index f74298d..17779ac 100644
--- a/src/glfw3.pc.in
+++ b/src/glfw3.pc.in
@@ -8,6 +8,6 @@ Description: A multi-platform library for OpenGL, window and input
Version: @GLFW_VERSION@
URL: https://www.glfw.org/
Requires.private: @GLFW_PKG_DEPS@
-Libs: -L${libdir} -l@GLFW_LIB_NAME@
+Libs: -L${libdir} -l@GLFW_LIB_NAME@@GLFW_LIB_NAME_SUFFIX@
Libs.private: @GLFW_PKG_LIBS@
Cflags: -I${includedir}

View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF 7482de6071d21db77a7236155da44c172a7f6c9e #v3.3.8
SHA512 ec45b620338cf36a8dbdf7aaf54d7c3a49a1be4ae1a1ef95f1531094fec670870713969bbc23476769d374c7a71d93f6540ab64c46fb5f66f4402bb2d15c7d87
HEAD_REF master
PATCHES
fix_win32_dllname.pacth #https://github.com/glfw/glfw/pull/2386
)
if(VCPKG_TARGET_IS_LINUX)

View File

@ -1,7 +1,7 @@
{
"name": "glfw3",
"version-semver": "3.3.8",
"port-version": 2,
"port-version": 3,
"description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.",
"homepage": "https://github.com/glfw/glfw",
"license": "Zlib",

View File

@ -2986,7 +2986,7 @@
},
"glfw3": {
"baseline": "3.3.8",
"port-version": 2
"port-version": 3
},
"gli": {
"baseline": "2021-07-06",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c21a08a861a502b0e10c4a82de391a60bba6a4e6",
"version-semver": "3.3.8",
"port-version": 3
},
{
"git-tree": "308cd3ebdf6752e9d5eeb2933f33972c784aa8bd",
"version-semver": "3.3.8",