Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix cmake logic for BUILD_EXTRA_LIBS

Browse Source
This commit is contained in:
Erwin Coumans
2017-09-06 15:59:34 -07:00
parent cfc07565ac
commit 7a2de3ea08
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@@ -420,7 +420,15 @@ ELSE()
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(INSTALL_LIBS) IF(INSTALL_LIBS)
#INSTALL of other files requires CMake 2.6
IF(BUILD_EXTRAS)
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" ON)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
ENDIF(BUILD_EXTRAS)
SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name") SET (LIB_DESTINATION "lib${LIB_SUFFIX}" CACHE STRING "Library directory name")
## the following are directories where stuff will be installed to ## the following are directories where stuff will be installed to
@@ -434,12 +442,8 @@ IF(INSTALL_LIBS)
DESTINATION DESTINATION
${PKGCONFIG_INSTALL_PREFIX}) ${PKGCONFIG_INSTALL_PREFIX})
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
ENDIF(INSTALL_LIBS) ENDIF()
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
OPTION(INSTALL_EXTRA_LIBS "Set when you want extra libraries installed" ON)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
OPTION(BUILD_UNIT_TESTS "Build Unit Tests" ON) OPTION(BUILD_UNIT_TESTS "Build Unit Tests" ON)