From 8e61d8288d0da4bb834cf6de33ac24320321693f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 12 Jan 2016 21:09:00 +0000 Subject: [PATCH] Emit the correct LIBNAME to .pc files Irrespective of "FREEGLUT_REPLACE_GLUT" being set to "No" or being on Win32 where this variable does not even exist, the .pc file contained Libs: -L${libdir} -lglut Instead, emit the correct value. (cherry picked from commit d06589f55c87370d388dec333f4bff35c29762f3) (cherry picked from commit d06589f55c87370d388dec333f4bff35c29762f3) git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1781 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71f4ef5..7fae09a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -389,6 +389,7 @@ IF(FREEGLUT_BUILD_STATIC_LIBS) ENDIF() +SET(LIBNAME freeglut) IF(WIN32) LIST(APPEND LIBS winmm) IF(FREEGLUT_BUILD_SHARED_LIBS) @@ -424,8 +425,6 @@ ELSE() ELSE() IF(FREEGLUT_REPLACE_GLUT) SET(LIBNAME glut) - ELSE() - SET(LIBNAME freeglut) ENDIF() ENDIF() @@ -563,7 +562,7 @@ ELSE() ENDIF() # Client applications need to define FreeGLUT GLES version to # bootstrap headers inclusion in freeglut_std.h: -SET(PC_LIBNAME "glut") +SET(PC_LIBNAME ${LIBNAME}) SET(PC_FILENAME "freeglut.pc") IF(FREEGLUT_GLES) SET(PC_CFLAGS "-DFREEGLUT_GLES") -- 1.7.10.4