diff options
Diffstat (limited to '3rdparty/glm/CMakeLists.txt')
| -rw-r--r-- | 3rdparty/glm/CMakeLists.txt | 99 |
1 files changed, 55 insertions, 44 deletions
diff --git a/3rdparty/glm/CMakeLists.txt b/3rdparty/glm/CMakeLists.txt index f5c87550f73..8d8fd8dc689 100644 --- a/3rdparty/glm/CMakeLists.txt +++ b/3rdparty/glm/CMakeLists.txt @@ -5,7 +5,7 @@ if (NOT CMAKE_VERSION VERSION_LESS "3.1") endif() project(glm) -set(GLM_VERSION "0.9.9") +set(GLM_VERSION "0.9.8") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -21,13 +21,11 @@ if(GLM_STATIC_LIBRARY_ENABLE) message(STATUS "GLM is a header only library, no need to build it. Set the option GLM_STATIC_LIBRARY_ENABLE with ON to build an optional static library") endif() -option(GLM_DYNAMIC_LIBRARY_ENABLE "GLM dynamic library" OFF) +option(GLM_DYNAMIC_LIBRARY_ENABLE "GLM static library" OFF) if(GLM_DYNAMIC_LIBRARY_ENABLE) message(STATUS "GLM is a header only library, no need to build it. Set the option GLM_DYNAMIC_LIBRARY_ENABLE with ON to build an optional dynamic library") endif() -option(GLM_INSTALL_ENABLE "GLM install" ON) - option(GLM_TEST_ENABLE "GLM test" OFF) if(NOT GLM_TEST_ENABLE) message(STATUS "GLM is a header only library, no need to build it. Set the option GLM_TEST_ENABLE with ON to build and run the test bench") @@ -97,10 +95,6 @@ else() endif() endif() -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - add_definitions(/FAs) -endif() - option(GLM_TEST_ENABLE_SIMD_SSE2 "Enable SSE2 optimizations" OFF) option(GLM_TEST_ENABLE_SIMD_SSE3 "Enable SSE3 optimizations" OFF) option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) @@ -119,7 +113,7 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX2) add_definitions(-mavx2) elseif(GLM_USE_INTEL) add_definitions(/QxAVX2) - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + elseif(MSVC) add_definitions(/arch:AVX2) endif() message(STATUS "GLM: AVX2 instruction set") @@ -128,7 +122,7 @@ elseif(GLM_TEST_ENABLE_SIMD_AVX) add_definitions(-mavx) elseif(GLM_USE_INTEL) add_definitions(/QxAVX) - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + elseif(MSVC) add_definitions(/arch:AVX) endif() message(STATUS "GLM: AVX instruction set") @@ -137,7 +131,7 @@ elseif(GLM_TEST_ENABLE_SIMD_SSE3) add_definitions(-msse3) elseif(GLM_USE_INTEL) add_definitions(/QxSSE3) - elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") AND NOT CMAKE_CL_64) + elseif(MSVC AND NOT CMAKE_CL_64) add_definitions(/arch:SSE2) # VC doesn't support /arch:SSE3 endif() message(STATUS "GLM: SSE3 instruction set") @@ -146,7 +140,7 @@ elseif(GLM_TEST_ENABLE_SIMD_SSE2) add_definitions(-msse2) elseif(GLM_USE_INTEL) add_definitions(/QxSSE2) - elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") AND NOT CMAKE_CL_64) + elseif(MSVC AND NOT CMAKE_CL_64) add_definitions(/arch:SSE2) endif() message(STATUS "GLM: SSE2 instruction set") @@ -172,50 +166,67 @@ add_subdirectory(glm) add_subdirectory(test) set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") -if (GLM_INSTALL_ENABLE) - install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -endif() +install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) +write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" + VERSION ${GLM_VERSION} + COMPATIBILITY AnyNewerVersion +) # build tree package config -configure_file(cmake/glmBuildConfig.cmake.in glmConfig.cmake @ONLY) +configure_file( + cmake/glmBuildConfig.cmake.in + glmConfig.cmake + @ONLY +) # install tree package config configure_package_config_file( - cmake/glmConfig.cmake.in - ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake - INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR} - PATH_VARS CMAKE_INSTALL_INCLUDEDIR - NO_CHECK_REQUIRED_COMPONENTS_MACRO) - -if (GLM_INSTALL_ENABLE) - install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" - DESTINATION ${GLM_INSTALL_CONFIGDIR}) -endif() + cmake/glmConfig.cmake.in + ${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake + INSTALL_DESTINATION ${GLM_INSTALL_CONFIGDIR} + PATH_VARS CMAKE_INSTALL_INCLUDEDIR + NO_CHECK_REQUIRED_COMPONENTS_MACRO +) + +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" + DESTINATION ${GLM_INSTALL_CONFIGDIR} +) if (NOT CMAKE_VERSION VERSION_LESS "3.0") - add_library(glm INTERFACE) - target_include_directories(glm INTERFACE - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) - install(TARGETS glm EXPORT glmTargets) - - export(EXPORT glmTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/glmTargets.cmake") - - if (GLM_INSTALL_ENABLE) - install(EXPORT glmTargets FILE glmTargets.cmake DESTINATION ${GLM_INSTALL_CONFIGDIR}) - endif() + add_library(glm INTERFACE) + target_include_directories(glm INTERFACE + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + ) + install(TARGETS glm EXPORT glmTargets) + + export( + EXPORT glmTargets + FILE "${CMAKE_CURRENT_BINARY_DIR}/glmTargets.cmake" + ) + + install( + EXPORT glmTargets FILE glmTargets.cmake + DESTINATION ${GLM_INSTALL_CONFIGDIR} + ) endif() # build pkg-config file -configure_file("./cmake/glm.pc.in" "glm.pc" @ONLY) +configure_file( + "./cmake/glm.pc.in" + "glm.pc" + @ONLY +) # install pkg-config file -if (GLM_INSTALL_ENABLE) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -endif() +install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" +) export(PACKAGE glm) |
