Merge pull request #7 from SRombauts/git_master
Fixed CMake UNIX config when building only the static or shared library
This commit is contained in:
commit
e739fd4519
@ -349,8 +349,12 @@ ELSE()
|
|||||||
SET(LIBNAME glut)
|
SET(LIBNAME glut)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME ${LIBNAME})
|
IF(FREEGLUT_BUILD_SHARED_LIBS)
|
||||||
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
|
SET_TARGET_PROPERTIES(freeglut PROPERTIES VERSION 3.9.0 SOVERSION 3 OUTPUT_NAME ${LIBNAME})
|
||||||
|
ENDIF()
|
||||||
|
IF(FREEGLUT_BUILD_STATIC_LIBS)
|
||||||
|
SET_TARGET_PROPERTIES(freeglut_static PROPERTIES OUTPUT_NAME ${LIBNAME})
|
||||||
|
ENDIF()
|
||||||
IF(ANDROID)
|
IF(ANDROID)
|
||||||
# Not in CMake toolchain file, because the toolchain
|
# Not in CMake toolchain file, because the toolchain
|
||||||
# file is called several times and generally doesn't
|
# file is called several times and generally doesn't
|
||||||
|
Reference in New Issue
Block a user