diff --git a/Documentation/doc/Documentation/Third_party.txt b/Documentation/doc/Documentation/Third_party.txt index 5739b44d85e..bde97ad021c 100644 --- a/Documentation/doc/Documentation/Third_party.txt +++ b/Documentation/doc/Documentation/Third_party.txt @@ -288,6 +288,8 @@ for more information. On some platforms, linking with `libunwind` was responsible for an increase of the runtime of the final application. If you experience such an issue, we recommend to compile \ceres without `glog` support. +\attention In the master branch of \ceres `glog` was dropped as a dependecy and `abseil` was added instead. It is not compatible with \visualstudio 2017 or earlier versions. + \subsection thirdpartyGLPK GLPK \glpk (GNU Linear Programming Kit) is a library for solving linear programming (LP), mixed integer programming (MIP), and other related problems. diff --git a/Installation/cmake/modules/FindEigen3.cmake b/Installation/cmake/modules/FindEigen3.cmake deleted file mode 100644 index e56005eb335..00000000000 --- a/Installation/cmake/modules/FindEigen3.cmake +++ /dev/null @@ -1,84 +0,0 @@ -# - Try to find Eigen3 lib -# -# This module supports requiring a minimum version, e.g. you can do -# find_package(Eigen3 3.1.2) -# to require version 3.1.2 or newer of Eigen3. -# -# Once done this will define -# -# EIGEN3_FOUND - system has eigen lib with correct version -# EIGEN3_INCLUDE_DIR - the eigen include directory -# EIGEN3_VERSION - eigen version - -# Copyright (c) 2006, 2007 Montel Laurent, -# Copyright (c) 2008, 2009 Gael Guennebaud, -# Copyright (c) 2009 Benoit Jacob -# Redistribution and use is allowed according to the terms of the 2-clause BSD license. - -include(FindPackageHandleStandardArgs) - -if(NOT Eigen3_FIND_VERSION) - if(NOT Eigen3_FIND_VERSION_MAJOR) - set(Eigen3_FIND_VERSION_MAJOR 2) - endif(NOT Eigen3_FIND_VERSION_MAJOR) - if(NOT Eigen3_FIND_VERSION_MINOR) - set(Eigen3_FIND_VERSION_MINOR 91) - endif(NOT Eigen3_FIND_VERSION_MINOR) - if(NOT Eigen3_FIND_VERSION_PATCH) - set(Eigen3_FIND_VERSION_PATCH 0) - endif(NOT Eigen3_FIND_VERSION_PATCH) - - set(Eigen3_FIND_VERSION "${Eigen3_FIND_VERSION_MAJOR}.${Eigen3_FIND_VERSION_MINOR}.${Eigen3_FIND_VERSION_PATCH}") -endif(NOT Eigen3_FIND_VERSION) - -macro(_eigen3_get_version) - file(READ "${EIGEN3_INCLUDE_DIR}/Eigen/src/Core/util/Macros.h" _eigen3_version_header) - - string(REGEX MATCH "define[ \t]+EIGEN_WORLD_VERSION[ \t]+([0-9]+)" _eigen3_world_version_match "${_eigen3_version_header}") - set(EIGEN3_WORLD_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+EIGEN_MAJOR_VERSION[ \t]+([0-9]+)" _eigen3_major_version_match "${_eigen3_version_header}") - set(EIGEN3_MAJOR_VERSION "${CMAKE_MATCH_1}") - string(REGEX MATCH "define[ \t]+EIGEN_MINOR_VERSION[ \t]+([0-9]+)" _eigen3_minor_version_match "${_eigen3_version_header}") - set(EIGEN3_MINOR_VERSION "${CMAKE_MATCH_1}") - - set(EIGEN3_VERSION ${EIGEN3_WORLD_VERSION}.${EIGEN3_MAJOR_VERSION}.${EIGEN3_MINOR_VERSION}) -endmacro(_eigen3_get_version) - -if (EIGEN3_INCLUDE_DIR) - - if (EXISTS ${EIGEN3_INCLUDE_DIR}/signature_of_eigen3_matrix_library) - # in cache already and valid - _eigen3_get_version() - set(EIGEN3_FOUND ${EIGEN3_VERSION_OK}) - - find_package_handle_standard_args(Eigen3 - REQUIRED_VARS EIGEN3_INCLUDE_DIR - VERSION_VAR EIGEN3_VERSION) - - else() - message(STATUS "Eigen3 path specified in cmake variable EIGEN3_INCLUDE_DIR is " - "set to ${EIGEN3_INCLUDE_DIR}, but that path does not contains the file " - "signature_of_eigen3_matrix_library and is considered as invalid.") - endif() - - - -else (EIGEN3_INCLUDE_DIR) - - find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library - HINTS ENV EIGEN3_INC_DIR - ENV EIGEN3_DIR - PATHS ${KDE4_INCLUDE_DIR} - PATH_SUFFIXES include eigen3 eigen - DOC "Directory containing the Eigen3 header files" - ) - - if(EIGEN3_INCLUDE_DIR) - _eigen3_get_version() - endif(EIGEN3_INCLUDE_DIR) - - find_package_handle_standard_args(Eigen3 - REQUIRED_VARS EIGEN3_INCLUDE_DIR - VERSION_VAR EIGEN3_VERSION) - -endif(EIGEN3_INCLUDE_DIR) diff --git a/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt index f7efd545128..88adb9e871a 100644 --- a/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(extrude_plugin PRIVATE scene_surface_mesh_item scene_selection_item) if(TARGET CGAL::Eigen3_support) - if("${EIGEN3_VERSION}" VERSION_GREATER "3.1.90") + if("${Eigen3_VERSION}" VERSION_GREATER "3.1.90") qt6_wrap_ui( hole_fillingUI_FILES Hole_filling_widget.ui) cgal_lab_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP) target_link_libraries(hole_filling_plugin PRIVATE scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen3_support) @@ -72,11 +72,10 @@ if(TARGET CGAL::Eigen3_support) set_tests_properties( "compilation of extrude_plugin" "compilation of fairing_plugin" + "compilation of hole_filling_plugin" + "compilation of remesh_planar_patches_plugin" + "compilation of smoothing_plugin" PROPERTIES RESOURCE_LOCK Selection_test_resources) - set_tests_properties( - "compilation of hole_filling_plugin" - "compilation of smoothing_plugin" - PROPERTIES RESOURCE_LOCK Selection_test_resources) endif() else() message(STATUS "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available.") @@ -184,13 +183,12 @@ target_link_libraries( if(CGAL_ENABLE_TESTING AND NOT CMAKE_VS_MSBUILD_COMMAND) set_tests_properties( + "compilation of degenerated_faces_plugin" + "compilation of engrave_text_plugin" + "compilation of isotropic_remeshing_plugin" "compilation of join_and_split_plugin" + "compilation of random_perturbation_plugin" "compilation of selection_plugin" "compilation of triangulate_facets_plugin" - "compilation of isotropic_remeshing_plugin" - "compilation of remesh_planar_patches_plugin" - "compilation of random_perturbation_plugin" - "compilation of engrave_text_plugin" - "compilation of degenerated_faces_plugin" PROPERTIES RESOURCE_LOCK Selection_test_resources) endif() diff --git a/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt index e02fc045929..397690a85a3 100644 --- a/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt @@ -1,6 +1,6 @@ include(CGALlab_macros) -if(TARGET CGAL::Eigen3_support AND "${EIGEN3_VERSION}" VERSION_GREATER "3.1.90") +if(TARGET CGAL::Eigen3_support AND "${Eigen3_VERSION}" VERSION_GREATER "3.1.90") qt6_wrap_ui(editionUI_FILES Deform_mesh.ui) add_item(scene_edit_item