Skip to content

Commit

Permalink
Check for CMake version before setting the policy
Browse files Browse the repository at this point in the history
  • Loading branch information
romainguy committed Mar 27, 2020
1 parent 94a01c6 commit ffa62d4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions libs/utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

# ==================================================================================================
Expand Down

0 comments on commit ffa62d4

Please sign in to comment.