From ffa62d4236287c6ca404b5f365e641163ef9016d Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Fri, 27 Mar 2020 11:50:01 -0700 Subject: [PATCH] Check for CMake version before setting the policy --- CMakeLists.txt | 4 +++- libs/utils/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c65f214057..bf9276d9fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,9 @@ option(FILAMENT_SKIP_SAMPLES "Don't build samples" OFF) # ================================================================================================== # CMake policies # ================================================================================================== -cmake_policy(SET CMP0074 NEW) +if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.12") + cmake_policy(SET CMP0074 NEW) +endif() # ================================================================================================== # Support for ccache diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt index bb79e4e4bd..3d7e544a97 100644 --- a/libs/utils/CMakeLists.txt +++ b/libs/utils/CMakeLists.txt @@ -114,9 +114,9 @@ set(INSTALL_TYPE ARCHIVE) install(TARGETS ${TARGET} ${INSTALL_TYPE} DESTINATION lib/${DIST_DIR}) install(FILES ${DIST_HDRS} DESTINATION include/${TARGET}) if (LINUX OR ANDROID) -install(FILES ${DIST_LINUX_HDRS} DESTINATION include/${TARGET_LINUX}) + install(FILES ${DIST_LINUX_HDRS} DESTINATION include/${TARGET_LINUX}) else() -install(FILES ${DIST_GENERIC_HDRS} DESTINATION include/${TARGET_GENERIC}) + install(FILES ${DIST_GENERIC_HDRS} DESTINATION include/${TARGET_GENERIC}) endif() # ==================================================================================================