From 18ad76722663c6e8cd462645b995080c67b5bff2 Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sun, 14 Jun 2020 21:18:47 +0200 Subject: CMake: Remove guards around CMP0043 and CMP0054 We require CMake >= 3.8 which includes the policies. CMP0043 OLD behaviour is still required by cotire. --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c5d4d80c96..e09ffecb382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,13 +20,8 @@ project(TrinityCore) # CMake policies (can not be handled elsewhere) cmake_policy(SET CMP0005 NEW) -if(POLICY CMP0043) - cmake_policy(SET CMP0043 NEW) # Disable 'Ignore COMPILE_DEFINITIONS_ properties' -endif() - -if(POLICY CMP0054) - cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted - prevents intepreting if (SOME_STRING_VARIABLE MATCHES "MSVC") as if (SOME_STRING_VARIABLE MATCHES "1") -endif() +cmake_policy(SET CMP0043 OLD) # Disable 'Ignore COMPILE_DEFINITIONS_ properties' +cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted - prevents intepreting if (SOME_STRING_VARIABLE MATCHES "MSVC") as if (SOME_STRING_VARIABLE MATCHES "1") if(POLICY CMP0074) cmake_policy(SET CMP0074 NEW) # find_package() uses _ROOT variables -- cgit v1.2.3