From cceac704cf40425b62c85764a272bd2ae18337e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Pa=C4=91en?= <49401914+ipadjen@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:28:34 +0200 Subject: [PATCH] Update cmakelists --- CMakeLists.txt | 21 ++++++++++++--------- thirdparty/val3dity/CMakeLists.txt | 3 +++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79470ed..59ed1b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,13 +11,17 @@ set(CMAKE_BUILD_TYPE "Release") # cmake_policy(SET CMP0003 NEW) #endif() +if(POLICY CMP0167) + cmake_policy(SET CMP0167 NEW) +endif() + if (MSVC) add_definitions(-DNOMINMAX) add_definitions("/EHsc") endif (MSVC) # BOOST -find_package(Boost 1.66 REQUIRED COMPONENTS filesystem locale QUIET) +find_package(Boost 1.72 REQUIRED COMPONENTS filesystem locale QUIET) if (WIN32) FIND_PACKAGE(Boost) if (Boost_FOUND) @@ -79,17 +83,16 @@ set_target_properties( ) target_link_libraries(city4cfd - ${CGAL_LIBRARIES} - ${CGAL_3RD_PARTY_LIBRARIES} - ${GDAL_LIBRARY} - ${Boost_SYSTEM_LIBRARY} - ${Boost_FILESYSTEM_LIBRARY} - ${Boost_LOCALE_LIBRARY} - LASlib + CGAL::CGAL + CGAL::CGAL_Core CGAL::Eigen3_support + GDAL::GDAL + Boost::filesystem + Boost::locale + LASlib roofer_api val3dity - ${OpenMP_support} + OpenMP::OpenMP_CXX ) install(TARGETS city4cfd DESTINATION bin) diff --git a/thirdparty/val3dity/CMakeLists.txt b/thirdparty/val3dity/CMakeLists.txt index ed8be46..f1af3aa 100644 --- a/thirdparty/val3dity/CMakeLists.txt +++ b/thirdparty/val3dity/CMakeLists.txt @@ -6,6 +6,9 @@ endif(COMMAND cmake_policy) cmake_minimum_required (VERSION 3.16) project( val3dity ) +if(POLICY CMP0167) + cmake_policy(SET CMP0167 NEW) +endif() add_definitions(-std=c++17)