feature/ubuntu20

cmake/Modules/FindCGAL.cmake

@@ -8,6 +8,21 @@
 # CGAL_LIBRARIES           : all libraries in one variable (use this in your CMakeLists)
 # CGAL_LIBRARY_DIR         : library path
 # CGAL_CGAL_LIBRARY        : full path to library
+#
+# NOTE: CGAL has changed their naming conventions
+# over the years, e.g. CGALimageIO is now CGAL_ImageIO
+# This find script tries to find the old and the 
+# new, so it's guaranteed to print a warning about 
+# libraries it did not find. 
+# 
+# NEW LIBRARY VARIABLES:
+#--------------------------
+# CGAL_CGAL_Core_LIBRARY
+# CGAL_CGAL_ImageIO_LIBRARY
+# CGAL_CGAL_Qt4_LIBRARY
+# 
+# OLD LIBRARY VARIABLES:
+# -------------------------
 # CGAL_CGALQt_LIBRARY      : full path to library
 # CGAL_CGALPDB_LIBRARY     : full path to library
 # CGAL_CGALimageIO_LIBRARY : full path to library
@@ -20,18 +35,25 @@ include( SimplePackageFind )
 set( PACKAGE_NAME           CGAL )
 set( PACKAGE_DIRS           CGAL )
 set( PACKAGE_REQ_LIBRARY    CGAL )
-set( PACKAGE_REQ_INCLUDE    CGAL/CGALversion.h )
+set( PACKAGE_REQ_INCLUDE    CGAL/version.h CGAL/CGALversion.h )
 
 simple_package_find("${PACKAGE_NAME}" 
                    "${PACKAGE_DIRS}" 
                    "${PACKAGE_REQ_LIBRARY}"
                    "${PACKAGE_REQ_INCLUDE}"
 )
 
+# NOTE: CGAL has changed their naming conventions
+# over the years, e.g. CGALimageIO is now CGAL_ImageIO
+# This find script tries to find the old and the 
+# new, so it's guaranteed to 
 ################################################
 if( ${PACKAGE_FOUND} )
   set( LIBRARY_NAMES
     CGAL
+    CGAL_Core
+    CGAL_ImageIO
+    CGAL_Qt4
     CGALQt
     CGALPDB
     CGALimageIO