From bf4306a6686c885143c96bfc695566bbf981f6dd Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 30 Dec 2015 20:22:31 +0100 Subject: [PATCH] Partially revert 37c93ba0, fixes #664 GLFW_LIB_NAME is required for the generation of the glfw3.pc pkg-config file, so add it back. --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 780917c10..6c3a280d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,6 +355,16 @@ foreach(arg ${glfw_PKG_LIBS}) set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} ${arg}") endforeach() +#-------------------------------------------------------------------- +# Choose library output name +#-------------------------------------------------------------------- +if (BUILD_SHARED_LIBS AND UNIX) + # On Unix-like systems, shared libraries can use the soname system. + set(GLFW_LIB_NAME glfw) +else() + set(GLFW_LIB_NAME glfw3) +endif() + #-------------------------------------------------------------------- # Create generated files #--------------------------------------------------------------------