diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc901cea606..415e03ab1c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,11 @@
 # Top level CMakeLists.txt for CGAL-branchbuild
+
+# Minimal version of CMake:
+cmake_minimum_required(VERSION 3.1)
+
 message( "== CMake setup ==" )
 project(CGAL CXX C)
 export(PACKAGE CGAL)
-# Minimal version of CMake:
-cmake_minimum_required(VERSION 3.1)
 
 set( CGAL_BRANCH_BUILD ON CACHE INTERNAL "Create CGAL from a Git branch" FORCE)
 
diff --git a/Installation/CMakeLists.txt b/Installation/CMakeLists.txt
index 7084d430d83..210be7795a4 100644
--- a/Installation/CMakeLists.txt
+++ b/Installation/CMakeLists.txt
@@ -3,13 +3,14 @@
 # refer to the root source directory of the project as ${CMAKE_SOURCE_DIR} or
 # ${CMAKE_SOURCE_DIR} and to the root binary directory of the project as
 # ${CMAKE_BINARY_DIR} or ${CMAKE_BINARY_DIR}.
-if(NOT PROJECT_NAME)
-  project(CGAL CXX C)
-endif()
 
 # Minimal version of CMake:
 cmake_minimum_required(VERSION 3.1)
 
+if(NOT PROJECT_NAME)
+  project(CGAL CXX C)
+endif()
+
 # Tested version:
 cmake_policy(VERSION 3.1)
 
diff --git a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
index e0eb6720e8b..74220a46fe6 100644
--- a/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
+++ b/Periodic_4_hyperbolic_triangulation_2/demo/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt
@@ -41,10 +41,7 @@ if(CGAL_FOUND AND CGAL_Core_FOUND AND Qt5_FOUND AND CGAL_Qt5_FOUND)
   #add_executable ( Periodic_4_hyperbolic_billiards_demo
   #Periodic_4_hyperbolic_billiards_demo.cpp ${RESOURCE_FILES} )
 
-  qt5_use_modules( P4HDT2 Widgets )
-  #qt5_use_modules( Periodic_4_hyperbolic_billiards_demo Widgets )
-
-  target_link_libraries( P4HDT2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
+  target_link_libraries( P4HDT2 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} Qt5::Widgets)
 
   #target_link_libraries( Periodic_4_hyperbolic_billiards_demo ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${Boost_LIBRARIES} )
 else()