mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Merge branch 'master' of https://github.com/shaxbee/glm into cmake
This commit is contained in:
commit
05d06d11e8
@ -177,7 +177,7 @@ install(
|
|||||||
DESTINATION ${GLM_INSTALL_CONFIGDIR}
|
DESTINATION ${GLM_INSTALL_CONFIGDIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
|
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
|
||||||
add_library(glm INTERFACE)
|
add_library(glm INTERFACE)
|
||||||
target_include_directories(glm INTERFACE
|
target_include_directories(glm INTERFACE
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
set(GLM_VERSION "@GLM_VERSION@")
|
set(GLM_VERSION "@GLM_VERSION@")
|
||||||
set(GLM_INCLUDE_DIRS "@CMAKE_CURRENT_SOURCE_DIR@")
|
set(GLM_INCLUDE_DIRS "@CMAKE_CURRENT_SOURCE_DIR@")
|
||||||
|
|
||||||
if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
|
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
|
||||||
endif()
|
endif()
|
||||||
|
@ -4,6 +4,6 @@ set(GLM_VERSION "@GLM_VERSION@")
|
|||||||
|
|
||||||
set_and_check(GLM_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
|
set_and_check(GLM_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
|
||||||
|
|
||||||
if (NOT CMAKE_VERSION VERSION_LESS "2.8.12")
|
if (NOT CMAKE_VERSION VERSION_LESS "3.0")
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake")
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user