From 2203db2b75f1728068a6e82a279c531b1abf307e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 26 Jul 2021 11:13:09 +0200
Subject: [PATCH] [cmake] Disable xdmf on Debug mode.
---
CMakeLists.txt | 2 +-
scripts/cmake/Dependencies.cmake | 68 +++++++++++++++++---------------
2 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26b83698bd0..082596090c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -194,7 +194,7 @@ include(packaging/Pack)
# ---- Subdirectories ----
include_directories(${PROJECT_SOURCE_DIR})
# xdmfdiff
-if(OGS_BUILD_TESTING)
+if(OGS_BUILD_TESTING AND TARGET OgsXdmf)
add_subdirectory(Tests/xdmfdiff)
endif()
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 55d47e8811e..e6fa6bc6a13 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -216,43 +216,47 @@ else()
endif()
endif()
-set(XDMF_LIBNAME OgsXdmf CACHE STRING "")
-CPMAddPackage(
- NAME xdmf
- VERSION 3.0.0
- GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/xdmflib.git
- GIT_TAG 8d5ae1e1cbf506b8ca2160745fc914e25690c8a4
- OPTIONS "XDMF_LIBNAME OgsXdmf"
-)
-if(xdmf_ADDED)
- target_include_directories(
- OgsXdmf PUBLIC ${xdmf_SOURCE_DIR} ${xdmf_BINARY_DIR}
+# Does not compile in Debug-mode, see #3175.
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+ set(XDMF_LIBNAME OgsXdmf CACHE STRING "")
+ CPMAddPackage(
+ NAME xdmf
+ VERSION 3.0.0
+ GIT_REPOSITORY https://gitlab.opengeosys.org/ogs/xdmflib.git
+ GIT_TAG 8d5ae1e1cbf506b8ca2160745fc914e25690c8a4
+ OPTIONS "XDMF_LIBNAME OgsXdmf"
+ EXCLUDE_FROM_ALL YES
)
+ if(xdmf_ADDED)
+ target_include_directories(
+ OgsXdmf PUBLIC ${xdmf_SOURCE_DIR} ${xdmf_BINARY_DIR}
+ )
- target_link_libraries(OgsXdmf Boost::boost)
- target_include_directories(
- OgsXdmfCore PUBLIC ${xdmf_SOURCE_DIR}/core ${xdmf_BINARY_DIR}/core
- PRIVATE ${xdmf_SOURCE_DIR}/CMake/VersionSuite
- )
- target_link_libraries(
- OgsXdmfCore PUBLIC Boost::boost LibXml2::LibXml2 ${HDF5_LIBRARIES}
- )
+ target_link_libraries(OgsXdmf Boost::boost)
+ target_include_directories(
+ OgsXdmfCore PUBLIC ${xdmf_SOURCE_DIR}/core ${xdmf_BINARY_DIR}/core
+ PRIVATE ${xdmf_SOURCE_DIR}/CMake/VersionSuite
+ )
+ target_link_libraries(
+ OgsXdmfCore PUBLIC Boost::boost LibXml2::LibXml2 ${HDF5_LIBRARIES}
+ )
- set_target_properties(
- OgsXdmf OgsXdmfCore
- PROPERTIES RUNTIME_OUTPUT_DIRECTORY
- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}
- LIBRARY_OUTPUT_DIRECTORY
- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
- ARCHIVE_OUTPUT_DIRECTORY
- ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
- )
- if(BUILD_SHARED_LIBS)
- install(TARGETS OgsXdmf OgsXdmfCore
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ set_target_properties(
+ OgsXdmf OgsXdmfCore
+ PROPERTIES RUNTIME_OUTPUT_DIRECTORY
+ ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}
+ LIBRARY_OUTPUT_DIRECTORY
+ ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE_OUTPUT_DIRECTORY
+ ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
)
+ if(BUILD_SHARED_LIBS)
+ install(TARGETS OgsXdmf OgsXdmfCore
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ )
+ endif()
+ list(APPEND DISABLE_WARNINGS_TARGETS OgsXdmf OgsXdmfCore)
endif()
- list(APPEND DISABLE_WARNINGS_TARGETS OgsXdmf OgsXdmfCore)
endif()
if(OGS_BUILD_SWMM)
--
GitLab