From b01d41375014368ac75c345014ad5ebc74083f45 Mon Sep 17 00:00:00 2001 From: Markus Holzer <markus.holzer@fau.de> Date: Mon, 11 Dec 2023 21:26:47 +0100 Subject: [PATCH] Update FindOpenMesh.cmake --- cmake/FindOpenMesh.cmake | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cmake/FindOpenMesh.cmake b/cmake/FindOpenMesh.cmake index dfe98d2dd..4dbb7f7dd 100644 --- a/cmake/FindOpenMesh.cmake +++ b/cmake/FindOpenMesh.cmake @@ -15,7 +15,7 @@ #=========================================================================== # # OpenMesh -# Copyright (c) 2001-2015, RWTH-Aachen University +# Copyright (c) 2001-2023, RWTH-Aachen University # Department of Computer Graphics and Multimedia # All rights reserved. # www.openmesh.org @@ -53,7 +53,7 @@ # #=========================================================================== -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.3.0) #if already found via finder or simulated finder in openmesh CMakeLists.txt, skip the search IF (NOT OPENMESH_FOUND) @@ -63,6 +63,13 @@ IF (NOT OPENMESH_FOUND) "${CMAKE_SOURCE_DIR}/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/libs_required/OpenMesh/src/OpenMesh" "${CMAKE_SOURCE_DIR}/../OpenMesh/src/OpenMesh" + "C:/Program Files/OpenMesh 10.0" + "C:/Program Files/OpenMesh 9.0" + "C:/Program Files/OpenMesh 8.1" + "C:/Program Files/OpenMesh 8.0" + "C:/Program Files/OpenMesh 7.2" + "C:/Program Files/OpenMesh 7.1" + "C:/Program Files/OpenMesh 7.0" "C:/Program Files/OpenMesh 6.3" "C:/Program Files/OpenMesh 6.2" "C:/Program Files/OpenMesh 6.1" @@ -81,6 +88,12 @@ IF (NOT OPENMESH_FOUND) "C:/Program Files/OpenMesh 2.4.1" "C:/Program Files/OpenMesh 2.4" "C:/Program Files/OpenMesh 2.0/include" + "C:/libs/OpenMesh 10.0" + "C:/libs/OpenMesh 9.0" + "C:/libs/OpenMesh 8.1" + "C:/libs/OpenMesh 8.0" + "C:/libs/OpenMesh 7.1" + "C:/libs/OpenMesh 7.0" "C:/libs/OpenMesh 6.3" "C:/libs/OpenMesh 6.2" "C:/libs/OpenMesh 6.1" @@ -98,7 +111,7 @@ IF (NOT OPENMESH_FOUND) "C:/libs/OpenMesh 3.0" "C:/libs/OpenMesh 2.4.1" "C:/libs/OpenMesh 2.4" - "${OPENMESH_DIR}" + "${OPENMESH_LIBRARY_DIR}" ) FIND_PATH (OPENMESH_INCLUDE_DIR OpenMesh/Core/Mesh/PolyMeshT.hh -- GitLab