Removed the glm_dummy CMake target if glm_shared or glm_static are enabled

This commit is contained in:
Christophe Riccio 2016-05-22 17:20:56 +02:00
parent 757fe39587
commit 6cf7389c8c
2 changed files with 23 additions and 23 deletions

View File

@ -140,11 +140,11 @@ if(GLM_TEST_ENABLE_FAST_MATH)
endif() endif()
if(MSVC) if(MSVC)
add_definitions(/fp:fast) add_definitions(/fp:fast)
endif() endif()
elseif(NOT GLM_TEST_ENABLE_FAST_MATH) elseif(NOT GLM_TEST_ENABLE_FAST_MATH)
if(MSVC) if(MSVC)
add_definitions(/fp:precise) add_definitions(/fp:precise)
endif() endif()
endif() endif()

View File

@ -1,5 +1,3 @@
set(NAME glm_dummy)
file(GLOB ROOT_SOURCE *.cpp) file(GLOB ROOT_SOURCE *.cpp)
file(GLOB ROOT_INLINE *.inl) file(GLOB ROOT_INLINE *.inl)
file(GLOB ROOT_HEADER *.hpp) file(GLOB ROOT_HEADER *.hpp)
@ -39,29 +37,31 @@ source_group("SIMD Files" FILES ${SIMD_HEADER})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
if(GLM_TEST_ENABLE) if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE)
add_executable(${NAME} ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT} if(GLM_STATIC_LIBRARY_ENABLE)
${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER} add_library(glm_static STATIC ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT}
${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER} ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER}
${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER} ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER}
${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER} ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER}
${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER}) ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER}
endif(GLM_TEST_ENABLE) ${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER})
endif(GLM_STATIC_LIBRARY_ENABLE)
if(GLM_STATIC_LIBRARY_ENABLE) if(GLM_DYNAMIC_LIBRARY_ENABLE)
add_library(glm_static STATIC ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT} add_library(glm_shared SHARED ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT}
${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER} ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER}
${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER} ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER}
${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER} ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER}
${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER} ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER}
${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER}) ${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER})
endif(GLM_STATIC_LIBRARY_ENABLE) endif(GLM_DYNAMIC_LIBRARY_ENABLE)
if(GLM_DYNAMIC_LIBRARY_ENABLE) else(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE)
add_library(glm_shared SHARED ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT} add_executable(glm_dummy ${ROOT_TEXT} ${ROOT_MD} ${ROOT_NAT}
${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER} ${ROOT_SOURCE} ${ROOT_INLINE} ${ROOT_HEADER}
${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER} ${CORE_SOURCE} ${CORE_INLINE} ${CORE_HEADER}
${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER} ${GTC_SOURCE} ${GTC_INLINE} ${GTC_HEADER}
${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER} ${GTX_SOURCE} ${GTX_INLINE} ${GTX_HEADER}
${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER}) ${SIMD_SOURCE} ${SIMD_INLINE} ${SIMD_HEADER})
endif(GLM_DYNAMIC_LIBRARY_ENABLE)
endif(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE)