From 0303b8dfd5eb99acb0668ff02e5e22c4d2c60424 Mon Sep 17 00:00:00 2001
From: Nicolas Saillant <saillantnicolas01@gmail.com>
Date: Tue, 5 Sep 2023 15:58:43 +0200
Subject: [PATCH] Update CMakeLists for QT6

---
 .../Polyline_simplification_2/CMakeLists.txt  | 27 +++++--------------
 .../Surface_mesh_deformation/CMakeLists.txt   |  5 ----
 .../demo/Triangulation_3/CMakeLists.txt       | 25 +++++------------
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
index 90254ff949d..db32bac7b39 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/CMakeLists.txt
@@ -4,39 +4,24 @@
 cmake_minimum_required(VERSION 3.1...3.23)
 project(Polyline_simplification_2_Demo)
 
-if(NOT POLICY CMP0070 AND POLICY CMP0053)
-  # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
-  cmake_policy(SET CMP0053 OLD)
-endif()
-
-if(POLICY CMP0071)
-  cmake_policy(SET CMP0071 NEW)
-endif()
-
 find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-find_package(Qt6 QUIET COMPONENTS OpenGLWidgets Widgets)
+find_package(Qt6 QUIET COMPONENTS Widgets)
 
 include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include)
 if(CGAL_Qt6_FOUND AND Qt6_FOUND)
-  set(CMAKE_AUTOMOC ON)
-
   add_definitions(-DQT_NO_KEYWORDS)
+  set(CMAKE_AUTOMOC ON)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_AUTORCC ON)
 
-  # UI files (Qt Designer files)
-  qt6_wrap_ui(CDT_UI_FILES Polyline_simplification_2.ui)
-
-  # qrc files (resources files, that contain icons, at least)
-  qt6_add_resources(CGAL_Qt6_RESOURCE_FILES
-                    ${CMAKE_CURRENT_SOURCE_DIR}/Polyline_simplification_2.qrc)
 
   # The executable itself.
-  add_executable(
+  qt_add_executable(
     Polyline_simplification_2
-    ${CMAKE_CURRENT_SOURCE_DIR}/Polyline_simplification_2.cpp ${CDT_UI_FILES}
-    ${CGAL_Qt6_RESOURCE_FILES} ${CGAL_Qt6_MOC_FILES})
+    Polyline_simplification_2.cpp Polyline_simplification_2.ui Polyline_simplification_2.qrc)
 
   target_link_libraries(Polyline_simplification_2
                         PRIVATE CGAL::CGAL CGAL::CGAL_Qt6 Qt6::Widgets)
diff --git a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
index 33263a81543..3f5e0bdb430 100644
--- a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
+++ b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt
@@ -4,11 +4,6 @@
 cmake_minimum_required(VERSION 3.1...3.23)
 project(Surface_mesh_deformation_Demo)
 
-if(NOT POLICY CMP0070 AND POLICY CMP0053)
-  # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
-  cmake_policy(SET CMP0053 OLD)
-endif()
-
 set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE)
 
 find_package(CGAL REQUIRED)
diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
index bce91a5a51b..1058b455a76 100644
--- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
@@ -4,14 +4,6 @@
 cmake_minimum_required(VERSION 3.1...3.23)
 project(Triangulation_3_Demo)
 
-if(NOT POLICY CMP0070 AND POLICY CMP0053)
-  # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning.
-  cmake_policy(SET CMP0053 OLD)
-endif()
-if(POLICY CMP0071)
-  cmake_policy(SET CMP0071 NEW)
-endif()
-
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -20,7 +12,7 @@ set(CMAKE_AUTOMOC ON)
 
 find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
 
-find_package(Qt6 QUIET COMPONENTS Widgets OpenGLWidgets OpenGL)
+find_package(Qt6 QUIET COMPONENTS Widgets OpenGL)
 
 if(Qt6_FOUND)
   add_definitions(-DQT_NO_KEYWORDS)
@@ -48,24 +40,19 @@ endif()
 if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   include_directories(BEFORE ./)
-
-  # ui files, created with Qt Designer
-  qt6_wrap_ui(uis MainWindow.ui)
-
-  # qrc files (resources files, that contain icons, at least)
-  qt6_add_resources(CGAL_Qt6_RESOURCE_FILES ./T3_demo.qrc)
+  set(CMAKE_AUTOUIC ON)
+  set(CMAKE_AUTORCC ON)
 
   # cpp files
-  add_executable(
+  qt_add_executable(
     T3_demo
     T3_demo.cpp
     MainWindow.cpp
     Viewer.cpp
     PreferenceDlg.cpp
     Scene.cpp
-    ${uis}
-    ${CGAL_Qt6_RESOURCE_FILES}
-    ${CGAL_Qt6_MOC_FILES})
+    MainWindow.ui
+    T3_demo.qrc)
 
   add_to_cached_list(CGAL_EXECUTABLE_TARGETS T3_demo)