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 commitd06589f55c
) (cherry picked from commitd06589f55c
) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1781 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
1026c5e915
commit
a2f7cd975f
@ -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")
|
||||
|
Reference in New Issue
Block a user