diff --git a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
index 034014e2d5c..fc970ec50e6 100644
--- a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
+++ b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt
@@ -32,6 +32,7 @@ find_package(Qt5 QUIET COMPONENTS Xml Script OpenGL)
 
 if(CGAL_Qt5_FOUND AND Qt5_FOUND )
 
+  set(CMAKE_INCLUDE_CURRENT_DIR ON)
   qt5_wrap_ui( UI_FILES MainWindow.ui )
 
   include(AddFileDependencies)
diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
index 5aabbf6b5e0..e3d3fe6d5ba 100644
--- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
+++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt
@@ -21,10 +21,11 @@ set(CMAKE_AUTOMOC ON)
 find_package(CGAL  COMPONENTS Qt5)
 
 
-find_package(Qt5 QUIET COMPONENTS OpenGL)
+find_package(Qt5 QUIET COMPONENTS OpenGL Xml)
 
 if(Qt5_FOUND)
   add_definitions(-DQT_NO_KEYWORDS)
+  set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif(Qt5_FOUND)
 
 # Activate concurrency ? (turned OFF by default)
@@ -64,8 +65,8 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND )
 
   add_to_cached_list( CGAL_EXECUTABLE_TARGETS T3_demo )
 
-  target_link_libraries( T3_demo PRIVATE ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
-  target_link_libraries( T3_demo PRIVATE Qt5::OpenGL)
+  target_link_libraries( T3_demo PRIVATE CGAL::CGAL CGAL::CGAL_Qt5)
+  target_link_libraries( T3_demo PRIVATE Qt5::OpenGL Qt5::Xml)
   if(TBB_FOUND)
     CGAL_target_use_TBB(T3_demo)
   endif()