From d96b45df06164393dc65285cf56cc61ba925733c Mon Sep 17 00:00:00 2001 From: Tan Meng Yue Date: Thu, 27 Dec 2018 10:24:13 +1100 Subject: [PATCH] Renamed glTFConfig to TinyGLTFConfig This renaming is done so that the config file matches the project name which is TinyGLTF. This is done to prevent future name collision should the Khronos glTF project decides to provide their own CMake configuration file. --- CMakeLists.txt | 2 +- cmake/TinyGLTFConfig.cmake | 15 +++++++++++++++ cmake/glTFConfig.cmake | 17 ----------------- 3 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 cmake/TinyGLTFConfig.cmake delete mode 100644 cmake/glTFConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 31647f5..75411f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ INSTALL ( FILES ) INSTALL ( FILES - cmake/glTFConfig.cmake + cmake/TinyGLTFConfig.cmake DESTINATION cmake ) diff --git a/cmake/TinyGLTFConfig.cmake b/cmake/TinyGLTFConfig.cmake new file mode 100644 index 0000000..2c2a75d --- /dev/null +++ b/cmake/TinyGLTFConfig.cmake @@ -0,0 +1,15 @@ +# -*- cmake -*- +# - Find TinyGLTF + +# TinyGLTF_INCLUDE_DIR TinyGLTF's include directory + + +FIND_PACKAGE ( PackageHandleStandardArgs ) + +SET ( TinyGLTF_INCLUDE_DIR "${TinyGLTF_DIR}/../include" CACHE STRING "TinyGLTF include directory") + +FIND_FILE ( TinyGLTF_HEADER tiny_gltf.h PATHS ${TinyGLTF_INCLUDE_DIR} ) + +IF (NOT TinyGLTF_HEADER) + MESSAGE ( FATAL_ERROR "Unable to find tiny_gltf.h, TinyGLTF_INCLUDE_DIR = ${TinyGLTF_INCLUDE_DIR}") +ENDIF () diff --git a/cmake/glTFConfig.cmake b/cmake/glTFConfig.cmake deleted file mode 100644 index c1502ee..0000000 --- a/cmake/glTFConfig.cmake +++ /dev/null @@ -1,17 +0,0 @@ -# -*- cmake -*- -# - Find glTF - -# glTF_INCLUDE_DIR glTF's include directory - - -FIND_PACKAGE ( PackageHandleStandardArgs ) - -SET ( glTF_INCLUDE_DIR "${glTF_DIR}/../include" CACHE STRING "glTF include directory") - -FIND_FILE ( glTF_HEADER tiny_gltf.h PATHS ${glTF_INCLUDE_DIR} ) - -IF (glTF_HEADER) - # MESSAGE ( STATUS "FOUND tiny_gltf.h, glTF_INCLUDE_DIR = ${glTF_INCLUDE_DIR}") -ELSE () - MESSAGE ( FATAL_ERROR "Unable to find tiny_gltf.h, glTF_INCLUDE_DIR = ${glTF_INCLUDE_DIR}") -ENDIF ()