From 603f6a5a032ab9b61537d18a0f532b593a7b108f Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Tue, 27 Aug 2024 14:00:46 +0200 Subject: [PATCH] OpenMesh >= 10.0 have a OpenMeshConfig.cmake file so we do not need FindOpenMesh.cmake anymore We add the target CGAL::OpenMesh_support to make it uniform with other dependencies --- .../cmake/modules/CGAL_OpenMesh_support.cmake | 24 ++--- Installation/cmake/modules/FindOpenMesh.cmake | 98 ------------------- Installation/cmake/modules/UseOpenMesh.cmake | 7 -- 3 files changed, 9 insertions(+), 120 deletions(-) delete mode 100644 Installation/cmake/modules/FindOpenMesh.cmake delete mode 100644 Installation/cmake/modules/UseOpenMesh.cmake diff --git a/Installation/cmake/modules/CGAL_OpenMesh_support.cmake b/Installation/cmake/modules/CGAL_OpenMesh_support.cmake index 1154b2f2cff..97df95c8115 100644 --- a/Installation/cmake/modules/CGAL_OpenMesh_support.cmake +++ b/Installation/cmake/modules/CGAL_OpenMesh_support.cmake @@ -1,23 +1,17 @@ if(OpenMesh_FOUND AND NOT TARGET CGAL::OpenMesh_support) - add_library(CGAL::OpenMesh_support UNKNOWN IMPORTED) + add_library(CGAL::OpenMesh_support INTERFACE IMPORTED) - set_target_properties(OpenMesh::OpenMesh PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_OPENMESH;NOMINMAX;_USE_MATH_DEFINES" - INTERFACE_INCLUDE_DIRECTORIES "${OPENMESH_INCLUDE_DIRS}") - - if(OPENMESH_CORE_LIBRARY_RELEASE) - set_property(TARGET OpenMesh::OpenMesh APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(OpenMesh::OpenMesh PROPERTIES - IMPORTED_LOCATION_RELEASE "${OPENMESH_CORE_LIBRARY_RELEASE}") + if(TARGET OpenMeshCore) + target_link_libraries(CGAL::OpenMesh_support INTERFACE OpenMeshCore) endif() - if(OPENMESH_CORE_LIBRARY_DEBUG) - set_property(TARGET OpenMesh::OpenMesh APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(OpenMesh::OpenMesh PROPERTIES - IMPORTED_LOCATION_DEBUG "${OPENMESH_CORE_LIBRARY_DEBUG}") + if(TARGET OpenMeshTools) + target_link_libraries(CGAL::OpenMesh_support INTERFACE OpenMeshTools) endif() + + target_compile_definitions(CGAL::OpenMesh_support + INTERFACE "CGAL_USE_OPENMESH;NOMINMAX;_USE_MATH_DEFINES") + endif() diff --git a/Installation/cmake/modules/FindOpenMesh.cmake b/Installation/cmake/modules/FindOpenMesh.cmake deleted file mode 100644 index 1c9d2198ed9..00000000000 --- a/Installation/cmake/modules/FindOpenMesh.cmake +++ /dev/null @@ -1,98 +0,0 @@ -#This modules tries to find OpenMesh -# Once done this will define -# -# OpenMesh_FOUND - system has OpenMesh -# OPENMESH_INCLUDE_DIR - OpenMesh include directory -# OPENMESH_LIBRARIES - OpenMesh libraries -# - -find_package(OpenMesh NO_MODULE QUIET) - -# Is it already configured? -if (NOT OpenMesh_FOUND) - - find_path(OPENMESH_INCLUDE_DIR - NAMES OpenMesh/Core/Mesh/ArrayKernel.hh - HINTS ENV OPENMESH_INC_DIR - ENV OPENMESH_DIR - /usr/include - /usr/local/include - PATH_SUFFIXES src include - DOC "The directory containing the OpenMesh header files WITHOUT the OpenMesh prefix" - ) - - find_library(OPENMESH_CORE_LIBRARY_RELEASE NAMES "OpenMeshCore" - HINTS ENV OPENMESH_LIB_DIR - ENV OPENMESH_DIR - PATH_SUFFIXES lib - DOC "Path to the OpenMeshCore library" - ) - - find_library(OPENMESH_CORE_LIBRARY_DEBUG NAMES "OpenMeshCored" - HINTS ENV OPENMESH_LIB_DIR - ENV OPENMESH_DIR - PATH_SUFFIXES lib - DOC "Path to the OpenMeshCored library" - ) - - find_library(OPENMESH_TOOLS_LIBRARY_RELEASE NAMES "OpenMeshTools" - HINTS ENV OPENMESH_LIB_DIR - ENV OPENMESH_DIR - PATH_SUFFIXES lib - DOC "Path to the OpenMeshTools library" - ) - - find_library(OPENMESH_TOOLS_LIBRARY_DEBUG NAMES "OpenMeshToolsd" - HINTS ENV OPENMESH_LIB_DIR - ENV OPENMESH_DIR - PATH_SUFFIXES lib - DOC "Path to the OpenMeshToolsd library" - ) - - #select configuration depending on platform (optimized... on windows) - include(SelectLibraryConfigurations) - select_library_configurations( OPENMESH_TOOLS ) - select_library_configurations( OPENMESH_CORE ) - - set(OPENMESH_LIBRARIES ${OPENMESH_CORE_LIBRARY} ${OPENMESH_TOOLS_LIBRARY} ) - set(OPENMESH_INCLUDE_DIRS ${OPENMESH_INCLUDE_DIR} ) - - include( FindPackageHandleStandardArgs ) - find_package_handle_standard_args(OpenMesh - REQUIRED_VARS OPENMESH_INCLUDE_DIRS OPENMESH_LIBRARIES - FOUND_VAR OpenMesh_FOUND - ) - - #target OpenMesh::OpenMesh - if(OpenMesh_FOUND AND NOT TARGET OpenMesh::OpenMesh) - add_library(CGAL_OpenMesh::CGAL_OpenMesh UNKNOWN IMPORTED) - - if(TARGET OpenMeshCore) - target_link_libraries(CGAL_OpenMesh::CGAL_OpenMesh INTERFACE OpenMeshCore) - return() - endif() - - set_target_properties(CGAL_OpenMesh::CGAL_OpenMesh PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_OPENMESH;NOMINMAX;_USE_MATH_DEFINES" - INTERFACE_INCLUDE_DIRECTORIES "${OPENMESH_INCLUDE_DIRS}") - - if(OPENMESH_CORE_LIBRARY_RELEASE) - set_property(TARGET CGAL_OpenMesh::CGAL_OpenMesh APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) - set_target_properties(CGAL_OpenMesh::CGAL_OpenMesh PROPERTIES - IMPORTED_LOCATION_RELEASE "${OPENMESH_CORE_LIBRARY_RELEASE}") - endif() - - if(OPENMESH_CORE_LIBRARY_DEBUG) - set_property(TARGET CGAL_OpenMesh::CGAL_OpenMesh APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) - set_target_properties(CGAL_OpenMesh::CGAL_OpenMesh PROPERTIES - IMPORTED_LOCATION_DEBUG "${OPENMESH_CORE_LIBRARY_DEBUG}") - endif() - endif() - -endif() - -if(OpenMesh_FOUND) - message(STATUS "OpenMesh found") -endif() \ No newline at end of file diff --git a/Installation/cmake/modules/UseOpenMesh.cmake b/Installation/cmake/modules/UseOpenMesh.cmake deleted file mode 100644 index 2d08d3f98fe..00000000000 --- a/Installation/cmake/modules/UseOpenMesh.cmake +++ /dev/null @@ -1,7 +0,0 @@ -# This module setups the compiler for using the OpenMesh library. -# It assumes that find_package(OpenMesh) was already called. - -include_directories ( ${OPENMESH_INCLUDE_DIR} ) -add_definitions( -DNOMINMAX -D_USE_MATH_DEFINES ) - -message(DEPRECATION "This file UseOpenMesh.cmake is deprecated, and the imported target `CGAL::Eigen3_support` from CGAL_OpenMesh_support.cmake should be used instead.")