From 41d9396c51bb7a80c148290c46ad90ebca1eff8d Mon Sep 17 00:00:00 2001 From: Georg Hagen Date: Mon, 27 Jan 2025 13:24:45 +0100 Subject: [PATCH] Update some cmake flags --- CMakeLists.txt | 1 + cmake/functions/SetCompilerSettings.cmake | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 50c3739..b14e2ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ if ("${PLATFORM}" STREQUAL "OS64" OR "${PLATFORM}" STREQUAL "OS64COMBINED") endif () set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +set(CMAKE_POLICY_DEFAULT_CMP0069 NEW) set(CMAKE_CXX_STANDARD 20) set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/cmake/functions/SetCompilerSettings.cmake b/cmake/functions/SetCompilerSettings.cmake index 8fe56ea..1778a36 100644 --- a/cmake/functions/SetCompilerSettings.cmake +++ b/cmake/functions/SetCompilerSettings.cmake @@ -1,6 +1,10 @@ -function(SetOptimisationSettings) +include(CheckIPOSupported) - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) +function(SetOptimisationSettings) + check_ipo_supported(RESULT result) + if(result) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE PARENT_SCOPE) + endif () if (LINUX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -mtune=native" PARENT_SCOPE) @@ -18,6 +22,7 @@ function(SetWarningSettings TARGET) elseif (WIN32) if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) + add_compile_options(/wd4068) set_target_properties(${TARGET} PROPERTIES COMPILE_FLAGS "/wd4068") set_target_properties(${TARGET} PROPERTIES COMPILE_FLAGS "/we4715") set_target_properties(${TARGET} PROPERTIES LINK_FLAGS "/ignore:4099")