From 990e280c8f5e2b4ac5df148febb1f8628f6bd9d7 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Sun, 25 Jan 2026 07:28:47 +0100 Subject: [PATCH] set cmake Boost find policy. Removed NeXus library find from cmake, since it will not be used anymore. --- CMakeLists.txt | 7 ++++--- src/external/Nonlocal/prog/CMakeLists.txt | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a3a37bd..b1bfc1a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ # - musrfit cmake_minimum_required(VERSION 3.17) +# cmake: use BoostConfig.cmake instead of FindBoost +cmake_policy(SET CMP0167 NEW) + project(musrfit VERSION 1.9.10 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- @@ -206,14 +209,13 @@ if (qt_based_tools) endif (qt_version STREQUAL 3) endif (qt_based_tools) -#--- if NeXus check also for HDF4, HDF5, and MXML ----------------------------- +#--- if NeXus check also for HDF4 (optional), HDF5 ---------------------------- if (nexus) find_package(HDF5 COMPONENTS CXX REQUIRED) if (HAVE_HDF4) find_package(HDF4 REQUIRED) add_definitions(-DHAVE_HDF4) endif (HAVE_HDF4) - find_package(NEXUS REQUIRED) add_definitions(-DPNEXUS_ENABLED) endif (nexus) @@ -316,7 +318,6 @@ if (nexus) message(" HDF4 not present.") endif (HAVE_HDF4) message(" HDF5 found in ${HDF5_INCLUDE_DIRS}, Version: ${HDF5_VERSION}") - message(" NeXus found in ${NEXUS_INCLUDE_DIR}, Version: ${NEXUS_VERSION_STRING}") endif (nexus) message("") diff --git a/src/external/Nonlocal/prog/CMakeLists.txt b/src/external/Nonlocal/prog/CMakeLists.txt index 1c36c0d0..b54e4225 100644 --- a/src/external/Nonlocal/prog/CMakeLists.txt +++ b/src/external/Nonlocal/prog/CMakeLists.txt @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.15) +# cmake: use BoostConfig.cmake instead of FindBoost +cmake_policy(SET CMP0167 NEW) + project(dump_nonlocal_field VERSION 1.0.0 LANGUAGES C CXX) #--- check for git ------------------------------------------------------------