From 9a9deb3147157e229dcbd6a2ddfb3b408fc337f1 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Sun, 29 Jul 2018 22:03:06 +0200 Subject: [PATCH] Export GLFW_PKG_{DEPS,LIBS} for use with client pkg-configs In order to avoid duplicating GLFW dependency probing in libraries depending on GLFW, export GLFW_PKG_DEPS and GLFW_PKG_LIBS so they may be used to populate pkg-config --static of dependent libraries. --- CMakeLists.txt | 6 ++++-- README.md | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7ac8192..6063b46a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,10 +304,12 @@ endif() # Export GLFW library dependencies #-------------------------------------------------------------------- foreach(arg ${glfw_PKG_DEPS}) - set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} ${arg}") + set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} ${arg}" CACHE INTERNAL + "GLFW pkg-config Requires.private") endforeach() foreach(arg ${glfw_PKG_LIBS}) - set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} ${arg}") + set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} ${arg}" CACHE INTERNAL + "GLFW pkg-config Libs.private") endforeach() #-------------------------------------------------------------------- diff --git a/README.md b/README.md index daa1be9ca..3898f5bd9 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,8 @@ information on what to include when reporting a bug. - [X11] Bugfix: Content scale fallback value could be inconsistent (#1578) - [Wayland] Bugfix: The `GLFW_HAND_CURSOR` shape used the wrong image (#1432) - [NSGL] Removed enforcement of forward-compatible flag for core contexts + - Export CMake `GLFW_PKG_DEPS` and `GLFW_PKG_LIBS` to parent scope for use + in client pkg-configs (#1307) ## Contact