diff options
| author | Ahmad Fatoum <[email protected]> | 2018-07-29 22:42:10 +0200 |
|---|---|---|
| committer | Ahmad Fatoum <[email protected]> | 2018-07-29 23:56:16 +0200 |
| commit | 286c41af5264511073c1da73d6b5d7de324c22ab (patch) | |
| tree | 081ce4207a26b195a77480d9d47b6b8871b31606 /src/external/glfw/CMakeLists.txt | |
| parent | 7154a833138d4ec2990d7503bd8dfbd47920e9f7 (diff) | |
| download | raylib-286c41af5264511073c1da73d6b5d7de324c22ab.tar.gz raylib-286c41af5264511073c1da73d6b5d7de324c22ab.zip | |
Sync with upstream GLFW pull request
The GLFW tree distributed with raylib has two modifications:
- GLFW_PKG_{DEPS,LIBS} are exported to PARENT_SCOPE, so we can use them
in our pkg-config file
- An intermediary glfw_objlib target is added, so we can reexport GLFW
symbols from libraylib.a
rglfw can fix the second point, but for Wayland usage, we would have to
replicate protocol generation, so we just leverage GLFW's existing
support instead.
To make maintenance easier, I have submitted a pull request for
including these modifications to upstream GLFW.
And to make that one easier, this patch dog-foods the modifications,
so raylib users can help find regressions. :-)
glfw/glfw#1307
Diffstat (limited to 'src/external/glfw/CMakeLists.txt')
| -rw-r--r-- | src/external/glfw/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/external/glfw/CMakeLists.txt b/src/external/glfw/CMakeLists.txt index 0eb7e7ea..83fe954e 100644 --- a/src/external/glfw/CMakeLists.txt +++ b/src/external/glfw/CMakeLists.txt @@ -327,10 +327,12 @@ endif() # Export GLFW library dependencies #-------------------------------------------------------------------- foreach(arg ${glfw_PKG_DEPS}) - set(GLFW_PKG_DEPS "${GLFW_PKG_DEPS} ${arg}" PARENT_SCOPE) + 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}" PARENT_SCOPE) + set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} ${arg}" CACHE INTERNAL + "GLFW pkg-config Libs.private") endforeach() #-------------------------------------------------------------------- |