Skip to content

Commit

Permalink
Removed obsolete FindGLM
Browse files Browse the repository at this point in the history
  • Loading branch information
shaxbee committed Mar 29, 2015
1 parent 288d1af commit 62a7dad
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 87 deletions.
41 changes: 23 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,26 +143,38 @@ include_directories("${PROJECT_SOURCE_DIR}/test/external")

add_subdirectory(glm)
add_subdirectory(test)
add_subdirectory(util)

install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
set(GLM_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")
set(GLM_INCLUDE_DIRS ${CMAKE_INSTALL_FULL_INCLUDEDIR})
install(DIRECTORY glm DESTINATION ${GLM_INCLUDE_DIRS})

include(CMakePackageConfigHelpers)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
VERSION ${GLM_VERSION}
COMPATIBILITY AnyNewerVersion
)

configure_file(cmake/glmConfig.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake"
@ONLY
)

install(
FILES
"${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
DESTINATION ${GLM_INSTALL_CONFIG_DIR}
)

if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
add_library(glm INTERFACE)
target_include_directories(glm INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
)
install(TARGETS glm EXPORT glmTargets)

set(GLM_INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm")

include(CMakePackageConfigHelpers)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
VERSION ${GLM_VERSION}
COMPATIBILITY AnyNewerVersion
)

export(
EXPORT glmTargets
FILE "${CMAKE_CURRENT_BINARY_DIR}/glmTargets.cmake"
Expand All @@ -171,11 +183,4 @@ if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
EXPORT glmTargets FILE glmTargets.cmake
DESTINATION ${GLM_INSTALL_CONFIG_DIR}
)

install(
FILES
cmake/glmConfig.cmake
"${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake"
DESTINATION ${GLM_INSTALL_CONFIG_DIR}
)
endif()
1 change: 0 additions & 1 deletion cmake/glmConfig.cmake

This file was deleted.

5 changes: 5 additions & 0 deletions cmake/glmConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set_and_check(GLM_INCLUDE_DIRS "@GLM_INCLUDE_DIRS@")

if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
endif()
3 changes: 0 additions & 3 deletions util/CMakeLists.txt

This file was deleted.

65 changes: 0 additions & 65 deletions util/FindGLM.cmake

This file was deleted.

0 comments on commit 62a7dad

Please sign in to comment.