From 3ec3e4e9d4c937152f87d7cfa91ab329f0e64ff6 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 17 Dec 2019 15:15:19 +0100 Subject: [PATCH] Fix FindOpenMesh.cmake ``` CMake Error at C:/CGAL/test/CGAL-5.1-Ic-33/cmake/modules/FindOpenMesh.cmake:54 (set_target_properties): Property INTERFACE_LINK_LIBRARIES may not contain link-type keyword "optimized". The INTERFACE_LINK_LIBRARIES property may contain configuration-sensitive generator-expressions which may be used to specify per-configuration rules. ``` https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-5.1-Ic-33/BGL/TestReport_afabri_x64_Cygwin-Windows10_MSVC2017-Release-64bits.gz --- Installation/cmake/modules/FindOpenMesh.cmake | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/Installation/cmake/modules/FindOpenMesh.cmake b/Installation/cmake/modules/FindOpenMesh.cmake index 83e241c0296..3e5060d6dd3 100644 --- a/Installation/cmake/modules/FindOpenMesh.cmake +++ b/Installation/cmake/modules/FindOpenMesh.cmake @@ -50,10 +50,23 @@ find_package_handle_standard_args(OpenMesh ) if(OpenMesh_FOUND AND NOT TARGET OpenMesh::OpenMesh) - add_library(OpenMesh::OpenMesh INTERFACE IMPORTED) + add_library(OpenMesh::OpenMesh UNKNOWN IMPORTED) + set_target_properties(OpenMesh::OpenMesh PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${OPENMESH_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${OPENMESH_LIBRARIES}" INTERFACE_COMPILE_DEFINITIONS "CGAL_USE_OPENMESH;NOMINMAX;_USE_MATH_DEFINES" - ) + INTERFACE_INCLUDE_DIRECTORIES "${OPENMESH_INCLUDE_DIRS}") + + if(OPENMESH_LIBRARY_RELEASE) + set_property(TARGET OpenMesh::OpenMesh APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) + set_target_properties(OpenMesh::OpenMesh PROPERTIES + IMPORTED_LOCATION_RELEASE "${OPENMESH_LIBRARY_RELEASE}") + endif() + + if(OPENMESH_LIBRARY_DEBUG) + set_property(TARGET OpenMesh::OpenMesh APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) + set_target_properties(OpenMesh::OpenMesh PROPERTIES + IMPORTED_LOCATION_DEBUG "${OPENMESH_LIBRARY_DEBUG}") + endif() endif()