Merge remote-tracking branch 'cgal/5.6.x-branch'

CGAL · Sep 11, 2024 · 41b096c · 41b096c
2 parents 9ff7098 + f1af52e
commit 41b096c
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 20 deletions.
diff --git a/GraphicsView/demo/Polygon/Polygon_2.cpp b/GraphicsView/demo/Polygon/Polygon_2.cpp
@@ -178,7 +178,9 @@ MainWindow::MainWindow()
   this->setupOptionsMenu();
   this->addAboutDemo(":/cgal/help/about_Polygon_2.html");
   this->addAboutCGAL();
+#if QT_SVG_LIB
   this->setupExportSVG(action_Export_SVG, graphicsView);
+#endif
 
   this->addRecentFiles(this->menuFile, this->actionQuit);
   connect(this, SIGNAL(openRecentFile(QString)),

diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
@@ -339,7 +339,9 @@ MainWindow::MainWindow()
   this->setupOptionsMenu();
   this->addAboutDemo(":/cgal/help/about_Constrained_Delaunay_triangulation_2.html");
   this->addAboutCGAL();
+#if QT_SVG_LIB
   this->setupExportSVG(this->actionExport_SVG, this->graphicsView);
+#endif
 
   this->addRecentFiles(this->menuFile, this->actionQuit);
   connect(this, SIGNAL(openRecentFile(QString)),

diff --git a/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Delaunay_triangulation_2.cpp
@@ -179,7 +179,9 @@ MainWindow::MainWindow()
   this->setupOptionsMenu();
   this->addAboutDemo(":/cgal/help/about_Delaunay_triangulation_2.html");
   this->addAboutCGAL();
+#if QT_SVG_LIB
   this->setupExportSVG(actionExport_SVG, graphicsView);
+#endif
 
   this->addRecentFiles(this->menuFile, this->actionQuit);
   connect(this, SIGNAL(openRecentFile(QString)),

diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
@@ -79,7 +79,9 @@ public Q_SLOTS:
   void setupOptionsMenu(QMenu* menu  = nullptr);
   void addAboutCGAL(QMenu* menu  = nullptr);
   void addAboutDemo(QString htmlResourceName, QMenu* menu  = nullptr);
+#if QT_SVG_LIB
   void setupExportSVG(QAction*, QGraphicsView*);
+#endif
 
   void addRecentFiles(QMenu* menu, QAction* insertBefore = nullptr);
 

diff --git a/Installation/cmake/modules/FindLASLIB.cmake b/Installation/cmake/modules/FindLASLIB.cmake
@@ -26,6 +26,7 @@ find_library(LASLIB_LIBRARIES
              PATHS ENV LD_LIBRARY_PATH
                    ENV LIBRARY_PATH
                    /usr/local/lib
+                   /usr/local/lib/LASlib
                    ${LASLIB_INCLUDE_DIR}/../../lib
                   ENV LASLIB_LIB_DIR
             )
@@ -36,6 +37,7 @@ if (NOT LASLIB_LIBRARIES)
                PATHS ENV LD_LIBRARY_PATH
                      ENV LIBRARY_PATH
                      /usr/local/lib
+                     /usr/local/lib/LASlib
                      ${LASLIB_INCLUDE_DIR}/../../lib
                     ENV LASLIB_LIB_DIR
               )

diff --git a/Lab/demo/Lab/Plugins/IO/CMakeLists.txt b/Lab/demo/Lab/Plugins/IO/CMakeLists.txt
@@ -1,10 +1,14 @@
 include(CGALlab_macros)
 
-find_package(LASLIB QUIET)
-set_package_properties(
-  LASLIB PROPERTIES
-  DESCRIPTION "A library for LIDAR I/O."
-  PURPOSE "Required for reading or writing LAS files.")
+if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
+  find_package(LASLIB QUIET)
+  set_package_properties(
+    LASLIB PROPERTIES
+    DESCRIPTION "A library for LIDAR I/O."
+    PURPOSE "Required for reading or writing LAS files.")
+else()
+  message(STATUS "NOTICE: the LAS reader does not work with your version of Visual Studio 2017.")
+endif()
 
 include(CGAL_LASLIB_support)
 

diff --git a/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt b/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt
@@ -90,9 +90,15 @@ if(TARGET CGAL::Eigen3_support)
     point_set_shape_detection_plugin
     PUBLIC scene_surface_mesh_item scene_points_with_normal_item
            scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support)
-
-  find_package(OpenGR QUIET)
-  include(CGAL_OpenGR_support)
+  if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910)
+    find_package(OpenGR QUIET)
+    include(CGAL_OpenGR_support)
+  else()
+      message(
+        STATUS
+          "NOTICE : OpenGR does not support your compiler."
+      )
+  endif()
   find_package(libpointmatcher QUIET)
   include(CGAL_pointmatcher_support)
 

diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
@@ -54,15 +54,20 @@ foreach(
   target_link_libraries(${target} PRIVATE ${CGAL_libs})
 endforeach()
 
-find_package(LASLIB QUIET)
-include(CGAL_LASLIB_support)
-if(TARGET CGAL::LASLIB_support)
-  create_single_source_cgal_program("read_las_example.cpp")
-  create_single_source_cgal_program("write_las_example.cpp")
-  target_link_libraries(read_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
-  target_link_libraries(write_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
+#disable if MSVC 2017
+if(NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
+  find_package(LASLIB QUIET)
+  include(CGAL_LASLIB_support)
+  if (TARGET CGAL::LASLIB_support)
+    create_single_source_cgal_program("read_las_example.cpp")
+    create_single_source_cgal_program("write_las_example.cpp")
+    target_link_libraries(read_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
+    target_link_libraries(write_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
+  else()
+    message(STATUS "NOTICE : the LAS reader test requires LASlib and will not be compiled.")
+  endif()
 else()
-  message(STATUS "NOTICE: the LAS reader example requires LASlib and will not be compiled.")
+  message(STATUS "NOTICE: the LAS reader does not work with your version of Visual Studio 2017.")
 endif()
 
 # Use Eigen
@@ -104,8 +109,15 @@ if(TARGET CGAL::Eigen3_support)
   endif()
 
   # Executables that require OpenGR
-  find_package(OpenGR QUIET)
-  include(CGAL_OpenGR_support)
+  if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910)
+    find_package(OpenGR QUIET)
+    include(CGAL_OpenGR_support)
+      message(
+        STATUS
+          "NOTICE : OpenGR does not support your compiler, registration_with_OpenGR will not be compiled."
+      )
+  endif()
+
   if(TARGET CGAL::OpenGR_support)
     create_single_source_cgal_program("registration_with_OpenGR.cpp")
     target_link_libraries(registration_with_OpenGR PRIVATE ${CGAL_libs}

diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
@@ -201,7 +201,9 @@ MainWindow::MainWindow()
   this->setupOptionsMenu();
   this->addAboutDemo(":/cgal/help/about_Polyline_simplification_2.html");
   this->addAboutCGAL();
+#if QT_SVG_LIB
   this->setupExportSVG(action_Export_SVG, graphicsView);
+#endif
 
   this->addRecentFiles(this->menuFile, this->actionQuit);
   connect(this, SIGNAL(openRecentFile(QString)), this, SLOT(open(QString)));

diff --git a/Stream_support/test/Stream_support/CMakeLists.txt b/Stream_support/test/Stream_support/CMakeLists.txt
@@ -13,8 +13,12 @@ find_library(
   NAMES 3MF
   DOC "Path to the lib3MF library")
 
-find_package(LASLIB QUIET)
-include(CGAL_LASLIB_support)
+if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
+  find_package(LASLIB QUIET)
+  include(CGAL_LASLIB_support)
+else()
+  message(STATUS "NOTICE : the LAS reader does not work with your version of Visual Studio 2017.")
+endif()
 
 # create a target per cppfile
 file(