Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to new policy for 3.17 cmake

Browse Source
This commit is contained in:
Jan Möbius
2020-04-22 08:07:00 +02:00
parent c1e5815efe
commit d1a2794808
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CI/ci-mac-build.sh
View File

@@ -13,6 +13,8 @@ echo "BuildPath: $BUILDPATH"
echo "Path: $PATH" echo "Path: $PATH"
echo "Language: $LANGUAGE" echo "Language: $LANGUAGE"
cmake --version
echo -e "${OUTPUT}" echo -e "${OUTPUT}"
echo "" echo ""
echo "======================================================================" echo "======================================================================"
@@ -58,4 +60,4 @@ if [ "$BUILD_TYPE_L" == "release" ]; then
cd .. cd ..
fi fi

7
cmake/ACGQt.cmake
View File

@@ -101,5 +101,12 @@ macro (acg_qt5)
# Enable automoc # Enable automoc
set(CMAKE_AUTOMOC ON) 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) endif (QT5_FOUND)
endmacro () endmacro ()