From f7d2242e98dbf85f0e272b091d6416b51dcb95c6 Mon Sep 17 00:00:00 2001 From: Daniel Weindl Date: Wed, 15 May 2024 09:43:10 +0200 Subject: [PATCH] map --- CMakeLists.txt | 2 +- src/CMakeLists.template.cmake | 4 ++++ swig/CMakeLists.txt | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a5a737b2..4b0c95321b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ endif() set(VENDORED_SUNDIALS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/sundials) set(SUNDIALS_PRIVATE_INCLUDE_DIRS "${VENDORED_SUNDIALS_DIR}/src") # Handle different sundials build/install dirs, depending on whether we are -# building the Python extension only or the full C++ interface +# building the Python extension only or the full C++ interface if(AMICI_PYTHON_BUILD_EXT_ONLY) set(VENDORED_SUNDIALS_BUILD_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(VENDORED_SUNDIALS_INSTALL_DIR ${VENDORED_SUNDIALS_BUILD_DIR}) diff --git a/src/CMakeLists.template.cmake b/src/CMakeLists.template.cmake index 575855be4a..dbad3e146c 100644 --- a/src/CMakeLists.template.cmake +++ b/src/CMakeLists.template.cmake @@ -38,6 +38,10 @@ endif() find_package(Amici TPL_AMICI_VERSION REQUIRED HINTS ${CMAKE_CURRENT_LIST_DIR}/../../build) message(STATUS "Found AMICI ${Amici_DIR}") +set_target_properties(Upstream::amici PROPERTIES + MAP_IMPORTED_CONFIG_RELWITHDEBINFO RelWithDebInfo;Release; + MAP_IMPORTED_CONFIG_RELEASE Release + MAP_IMPORTED_CONFIG_DEBUG Debug;RelWithDebInfo;) # Debug build? if("$ENV{ENABLE_AMICI_DEBUGGING}" OR "$ENV{ENABLE_GCOV_COVERAGE}") diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 7b7baf9be9..5cc6e6b5a2 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -20,7 +20,10 @@ find_package( Python3 COMPONENTS Interpreter Development NumPy REQUIRED) -message(STATUS "Found numpy ${Python3_NumPy_VERSION} include dir ${Python3_NumPy_INCLUDE_DIRS}") +message( + STATUS + "Found numpy ${Python3_NumPy_VERSION} include dir ${Python3_NumPy_INCLUDE_DIRS}" +) set(AMICI_INTERFACE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/amici.i ${CMAKE_CURRENT_SOURCE_DIR}/edata.i