Correction of some problem (SDK Windows, REQUIERED thing...) and add of comments for findQt5.cmake.

AABB_tree/demo/AABB_tree/CMakeLists.txt

@@ -20,7 +20,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt

@@ -15,7 +15,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt

@@ -11,7 +11,7 @@ endif()
 
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Core Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Core Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Boolean_set_operations_2/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 Core REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5 Core)
 
 include(${CGAL_USE_FILE})
 	

CGAL_ImageIO/demo/CGALimageIO/CMakeLists.txt

@@ -28,30 +28,13 @@ find_package(CGAL REQUIRED ImageIO)
 
 include( ${CGAL_USE_FILE} )
 
-#New for Qt5 version !
-option (USE_QT5 "Use Qt5 version instead of Qt4" ON)
-
-if(USE_QT5)
 	
-	find_package(Qt5)
+find_package(Qt4or5)
 
-else (USE_QT5)
-
-	find_package(Qt4)
-
-	if(CGAL_Qt4_FOUND AND QT4_FOUND)
-		include(${QT_USE_FILE})
-		message("Qt4 found")
-		set(QT4 TRUE)
-	endif()
-
-endif (USE_QT5)
-
-include(QtChoice)
 
 find_package(VTK QUIET)
 
-if(QT_FOUND AND VTK_FOUND)
+if(QT${QT_VERSION_USED}_FOUND AND VTK_FOUND)
   add_definitions(-DCGAL_USE_VTK)
   include(${VTK_USE_FILE})
 

Circular_kernel_3/demo/Circular_kernel_3/CMakeLists.txt

@@ -13,7 +13,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Bounding_volumes/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Circular_kernel_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Generator/CMakeLists.txt

@@ -17,7 +17,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/GraphicsView/CMakeLists.txt

@@ -14,7 +14,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt

@@ -17,7 +17,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt

@@ -15,7 +15,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Polygon/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 Core GMP MPFR REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5 Core GMP MPFR)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 Core REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5 Core)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Snap_rounding_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Spatial_searching_2/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Stream_lines_2/CMakeLists.txt

@@ -15,7 +15,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

GraphicsView/demo/Triangulation_2/CMakeLists.txt

@@ -17,7 +17,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Installation/cmake/modules/FindQt5.cmake

@@ -1,13 +1,129 @@
-
+#======================================================FindQt5.cmake=====================================================
+#
+#
+#	This file has on purpose to search and include Qt5 modules wanted by the user.
+#
+#	To make this findQt5.cmake compatible with the Qt4 find_package, we use the QT_USE_QT* flags.
+#
+#	However, if the used does not set the flag QT_USE_QTCORE, this one is automatically set when findQt5 called.
+#
+#	NOTICE : Some part of this file are porting from findQt4.cmake by Kitware, Inc.
+#
+#==========================================================Success========================================================
+#
+#	If all modules asked by the user are found, so the flags QT5 and QT5_FOUND are set to TRUE.
+#
+#
+#==========================================================Failure========================================================
+#
+#
+#	If all modules asked by the flags are not found, findQt5 fails and returns the list of modules missing.
+#
+#   The flags QT5 and QT5_FOUND are not set.
+#
+#
+#========================================================Typical use=======================================================
+#
+# 	Typical use could be : 
+#
+#		set( QT_USE_QTXML    TRUE )
+#		set( QT_USE_QTSCRIPT  TRUE )
+#		set( QT_USE_QTOPENGL  TRUE )
+#
+#
+#		find_package(CGAL REQUIRED COMPONENTS Qt5) //Because we want to know the CGAL path to use findQt4or5
+#
+#		include(${CGAL_USE_FILE})// Same
+#	
+#		find_package(Qt5)// Here, we search and include all the modules previously set by the QT_USE_QT* flags.	
+#
+#		IF(QT5_FOUND)
+#
+#			qt5_wrap_cpp(cpp file.cpp)
+#			qt5_wrap_ui (ui  fileui.ui )
+#			qt5_add_ressource ( RESOURCE_FILES filescr.qrc )
+#			qt5_generate_moc ( file.h file_moc.cpp)
+#
+#       	IF(QT5)
+#				add_library(example
+#				file.cpp
+#				file_moc.cpp
+#				)
+#			ENDIF(QT5)
+#		ENDIF(QT5_FOUND)
+#
+#
+#	NORICE : this way is to does not use the AUTOMOC.
+#
+#================================================FindQt4.cmake compatibility==============================================
+#
+#	The QT_USE_QT* flags supported byb findQt5 are the followings :
+#
+#                    QT_USE_QTCORE
+#                    QT_USE_QTD-BUS
+#                    QT_USE_QTDECLARATIVE
+#                    QT_USE_QTDESIGNER
+#                    QT_USE_QTGRAPHICAL_EFFECTS
+#                    QT_USE_QTGUI
+#                    QT_USE_QTIMAGEFORMATS
+#                    QT_USE_QTHELP
+#                    QT_USE_QTMACEXTRATS
+#                    QT_USE_QTMULTIMEDIA
+#                    QT_USE_QTNETWORK
+#                    QT_USE_QTNFC
+#                    QT_USE_QTOPENGL
+#                    QT_USE_QTPOSITIONING
+#                    QT_USE_QTPRINTSUPPORT
+#                    QT_USE_QTQML
+#                    QT_USE_QTQUICK
+#                    QT_USE_QTSCRIPT
+#                    QT_USE_QTSENSORS
+#                    QT_USE_QTSERIALPORT
+#                    QT_USE_QTSQL
+#                    QT_USE_QTSVG
+#                    QT_USE_QTTEST
+#                    QT_USE_QTUITOOLS
+#                    QT_USE_QTWEBKIT
+#                    QT_USE_QTWIDGETS
+#                    QT_USE_QTWEBSOCKEETS
+#                    QT_USE_QTWINDOWSEXTRAS
+#                    QT_USE_QTX11EXTRAS
+#                    QT_USE_QTXML
+#                    QT_USE_QTXMLPATTERNS
+#
+#
+#======================================================WIN_SDK_PATH=====================================================
+#
+#	This is the PATH to the Windows SDK that Qt5 needs to know.
+#
+#	The path is automatically set if contains into CMake Configuration files of CGAL. Otherwise, the user has to inform 
+# the path into CMake-gui. 
+#
+#	For instance, on Windows 8 64 bits, the path is : C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x64
+#
+#  NOTICE : Finally, it seems that this part is not necessary.
+#
+#
+#
 
 
 MESSAGE("Searching Qt5 modules.")
 
-if(WIN32)
-	MESSAGE("Qt5 on Windows needs Windows SDK.")
-	
-	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "C:\\Program Files (x86)\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\x64")	
-endif()
+#
+#	This one is maybe not necessary...
+#
+#if(WIN32)
+#
+#	set (WIN_SDK_PATH ${WIN_SDK_PATH_MEMORY})
+#	
+#	if ( WIN_SDK_PATH_temp STREQUAL "" )
+#		MESSAGE("Qt5 on Windows needs Windows SDK.")
+#	
+#		PATH ( WIN_SDK_PATH "")
+#	endif()
+#	
+#	SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} ${WIN_SDK_PATH})	
+#endif()
 
 UNSET(QT5 CACHE)
 UNSET(QT5_FOUND CACHE)

Linear_cell_complex/demo/Linear_cell_complex/CMakeLists.txt

@@ -33,7 +33,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 include(${CGAL_USE_FILE})
 
 find_package(Qt4or5)

Mesh_3/demo/Mesh_3/CMakeLists.txt

@@ -31,7 +31,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 ImageIO REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5 ImageIO)
 
 include(${CGAL_USE_FILE})
 	

Mesh_3/demo/Mesh_3/implicit_functions/CMakeLists.txt

@@ -21,7 +21,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 ImageIO REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5 ImageIO)
 
 include(${CGAL_USE_FILE})
 

Periodic_3_triangulation_3/demo/Periodic_Lloyd_3/CMakeLists.txt

@@ -16,7 +16,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Polyhedron/demo/Polyhedron/CMakeLists.txt

@@ -46,7 +46,7 @@ if( POLYHEDRON_QTSCRIPT_DEBUGGER)
   set( QT_USE_QTSCRIPTTOOLS  TRUE )
 endif()
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Polyhedron/demo/Polyhedron/implicit_functions/CMakeLists.txt

@@ -21,7 +21,7 @@ set( QT_USE_QTXML    TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5 REQUIRED)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt

@@ -24,7 +24,7 @@ set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
 
-find_package(CGAL COMPONENTS Qt4or5)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Surface_mesher/demo/Surface_mesher/CMakeLists.txt

@@ -26,20 +26,19 @@ endforeach()
 
 include_directories( ./ )
 
-# QGLViwer needs Qt4 configured with QtOpenGL and QtXml support
+# QGLViwer needs Qt configured with QtOpenGL and QtXml support
 
 set( QT_USE_QTOPENGL TRUE )
 set( QT_USE_QTXML    TRUE )
 set( QT_USE_QTMAIN   TRUE )
 
-find_package(CGAL COMPONENTS ImageIO Qt4or5)
+find_package(CGAL REQUIRED COMPONENTS ImageIO Qt4or5)
 
 include(${CGAL_USE_FILE})
 
 find_package(Qt4or5)
 
 if ( CGAL_FOUND AND QT${QT_VERSION_USED}_FOUND AND CGAL_ImageIO_FOUND)
-  include( ${CGAL_USE_FILE} )
 
   find_package(QGLViewer )
   find_package(OpenGL    )

Surface_mesher/demo/Surface_mesher/mainwindow.cpp

@@ -158,4 +158,4 @@ void MainWindow::on_action_Clone_triggered()
   other->show();
 }
 
-#include "mainwindow.moc"
+#include "mainwindow.moc"

Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/CMakeLists.txt

@@ -24,7 +24,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})
 	

Triangulation_3/demo/Triangulation_3/CMakeLists.txt

@@ -15,7 +15,7 @@ set( QT_USE_QTMAIN   TRUE )
 set( QT_USE_QTSCRIPT  TRUE )
 set( QT_USE_QTOPENGL  TRUE )
 
-find_package(CGAL COMPONENTS Qt4or5)
+find_package(CGAL REQUIRED COMPONENTS Qt4or5)
 
 include(${CGAL_USE_FILE})