From 6f688414e4fe4c7d33a6e99ff682e229a1888403 Mon Sep 17 00:00:00 2001 From: Zbigniew Mandziejewicz Date: Sat, 12 Nov 2016 18:30:17 +0800 Subject: [PATCH 1/2] Fix name for CMake version file --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 712c463f..0a5204ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion ) @@ -188,7 +188,7 @@ configure_package_config_file( install( FILES "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" DESTINATION ${GLM_INSTALL_CONFIGDIR} ) From ab998f444730d712e616a19257c5b223d05e1c69 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 12 Nov 2016 11:46:21 +0100 Subject: [PATCH 2/2] - Fixed CMake find_package with version specification #572 #573 --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index fbe4c582..c9fb2ab6 100644 --- a/readme.md +++ b/readme.md @@ -60,6 +60,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed GTX_transform2 shear* functions #403 - Fixed interaction between GLM_FORCE_UNRESTRICTED_GENTYPE and ortho function #568 - Fixed bitCount with AVX on 32 bit builds #567 +- Fixed CMake find_package with version specification #572 #573 #### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01 ##### Improvements: