diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c9d4fc2..224a4503 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,12 @@ if("${PROJECT_NAME}" STREQUAL "")
     project (OpenMesh)
 endif()
 
+# Set AUTO UIC/MOC Policy to new for CMAKE 3.17 or higher
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17")
+    cmake_policy(SET CMP0100 NEW)
+endif()
+
+
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.9" OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.9")
 		message(WARNING "Your version of GCC contains an optimizer bug. Please verify that you do not use -O3!")
diff --git a/cmake/ACGQt.cmake b/cmake/ACGQt.cmake
index 271d15df..c3e6ed67 100644
--- a/cmake/ACGQt.cmake
+++ b/cmake/ACGQt.cmake
@@ -101,10 +101,5 @@ macro (acg_qt5)
     # Enable automoc
     set(CMAKE_AUTOMOC ON)
 
-    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") 
-      cmake_policy(SET CMP0100 NEW)
-    endif()
-
-
   endif (QT5_FOUND)
 endmacro ()