From 4d47b273339dd30e93ad7d7655b4f075e85337d1 Mon Sep 17 00:00:00 2001 From: Will Usher Date: Sun, 16 Feb 2020 14:33:59 -0800 Subject: [PATCH] Adjust cmake file paths to match make install for distribution --- .../glm/glmConfig-version.cmake | 0 cmake/glm/glmConfig.cmake | 22 +++++++++++++++++++ glmConfig.cmake | 13 ----------- 3 files changed, 22 insertions(+), 13 deletions(-) rename glmConfig-version.cmake => cmake/glm/glmConfig-version.cmake (100%) create mode 100644 cmake/glm/glmConfig.cmake delete mode 100644 glmConfig.cmake diff --git a/glmConfig-version.cmake b/cmake/glm/glmConfig-version.cmake similarity index 100% rename from glmConfig-version.cmake rename to cmake/glm/glmConfig-version.cmake diff --git a/cmake/glm/glmConfig.cmake b/cmake/glm/glmConfig.cmake new file mode 100644 index 00000000..4fba5116 --- /dev/null +++ b/cmake/glm/glmConfig.cmake @@ -0,0 +1,22 @@ +cmake_minimum_required(VERSION 3.2 FATAL_ERROR) +cmake_policy(VERSION 3.2) + +set(GLM_VERSION 0.9.9) + +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if (_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +# Set the old GLM_INCLUDE_DIRS variable for backwards compatibility +set(GLM_INCLUDE_DIRS ${_IMPORT_PREFIX}) + +add_library(glm::glm INTERFACE IMPORTED) +set_target_properties(glm::glm PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES ${GLM_INCLUDE_DIRS}) + +mark_as_advanced(glm_DIR) +set(_IMPORT_PREFIX) + diff --git a/glmConfig.cmake b/glmConfig.cmake deleted file mode 100644 index 75d854e0..00000000 --- a/glmConfig.cmake +++ /dev/null @@ -1,13 +0,0 @@ -cmake_minimum_required(VERSION 3.2 FATAL_ERROR) -cmake_policy(VERSION 3.2) - -set(GLM_VERSION 0.9.9) -# Set the old GLM_INCLUDE_DIRS variable for backwards compatibility -set(GLM_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}) - -add_library(glm::glm INTERFACE IMPORTED) -set_target_properties(glm::glm PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}) - -mark_as_advanced(glm_DIR) -