From d1a2794808e89c1bb3a2569578c23adf95c79132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 22 Apr 2020 08:07:00 +0200 Subject: [PATCH] Switch to new policy for 3.17 cmake --- CI/ci-mac-build.sh | 4 +++- cmake/ACGQt.cmake | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CI/ci-mac-build.sh b/CI/ci-mac-build.sh index 44773c39..58b527de 100755 --- a/CI/ci-mac-build.sh +++ b/CI/ci-mac-build.sh @@ -13,6 +13,8 @@ echo "BuildPath: $BUILDPATH" echo "Path: $PATH" echo "Language: $LANGUAGE" +cmake --version + echo -e "${OUTPUT}" echo "" echo "======================================================================" @@ -58,4 +60,4 @@ if [ "$BUILD_TYPE_L" == "release" ]; then cd .. -fi \ No newline at end of file +fi diff --git a/cmake/ACGQt.cmake b/cmake/ACGQt.cmake index c3e6ed67..e91f4b82 100644 --- a/cmake/ACGQt.cmake +++ b/cmake/ACGQt.cmake @@ -101,5 +101,12 @@ macro (acg_qt5) # Enable automoc set(CMAKE_AUTOMOC ON) + if(${CMAKE_VERSION} VERSION_GREATER "3.17") + + cmake_policy(SET CMP0100 NEW) + message("Version greater 3.17, enable policy") + endif() + + endif (QT5_FOUND) endmacro ()