From 60a335414ba1d0fbddfcc278d6f4b438e8b1699b Mon Sep 17 00:00:00 2001 From: nicolas le goff Date: Tue, 20 Feb 2024 21:05:31 +0100 Subject: [PATCH] accommodate machine_types dependency --- CMakeLists.txt | 2 +- CMakePresets.json | 4 ++-- smooth3D/smooth3DConfig.cmake.in | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ead474..accc4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ include(CMakePrintHelpers) project(smooth3D LANGUAGES C CXX - VERSION 3.2.0) + VERSION 3.3.0) cmake_print_variables(smooth3D_VERSION) diff --git a/CMakePresets.json b/CMakePresets.json index f7b38a2..8c67336 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,10 +5,10 @@ "name": "ci", "cacheVariables": { "CMAKE_POSITION_INDEPENDENT_CODE": "ON", - "WITH_EXTERNAL_MACHINETYPES": "OFF", "Mesquite_ROOT": "$env{INSTALL_DIR}/mesquite-2.3.0", "gmds_ROOT": "$env{INSTALL_DIR}/gmds072", - "Lima_ROOT": "$env{INSTALL_DIR}/lima" + "Lima_ROOT": "$env{INSTALL_DIR}/lima", + "MachineTypes_ROOT": "$env{INSTALL_DIR}/machine_types" } } ] diff --git a/smooth3D/smooth3DConfig.cmake.in b/smooth3D/smooth3DConfig.cmake.in index 1ee8b5b..23eccb2 100644 --- a/smooth3D/smooth3DConfig.cmake.in +++ b/smooth3D/smooth3DConfig.cmake.in @@ -1,3 +1,6 @@ +include(CMakeFindDependencyMacro) +find_dependency(MachineTypes) + set(smooth3D_VERSION "@smooth3D_VERSION@") @PACKAGE_INIT@