From d3a66b706ff7a7181249164f136cdf05eedb83c9 Mon Sep 17 00:00:00 2001 From: "Randolph R. Settgast" Date: Wed, 10 Jan 2024 13:08:05 -0800 Subject: [PATCH] apply patch to remove -fcompare-debug-second flag from propagating out of umpire --- CMakeLists.txt | 1 + tplMirror/umpire_fcompare-debug-second.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 tplMirror/umpire_fcompare-debug-second.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index f7db0b78..d8ed125d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,6 +386,7 @@ ExternalProject_Add( chai URL ${CHAI_URL} INSTALL_DIR ${CHAI_DIR} DEPENDS raja + PATCH_COMMAND patch -p0 < ${TPL_MIRROR_DIR}/umpire_fcompare-debug-second.patch BUILD_COMMAND ${TPL_BUILD_COMMAND} INSTALL_COMMAND ${TPL_INSTALL_COMMAND} CMAKE_GENERATOR ${TPL_GENERATOR} diff --git a/tplMirror/umpire_fcompare-debug-second.patch b/tplMirror/umpire_fcompare-debug-second.patch new file mode 100644 index 00000000..da7b57e1 --- /dev/null +++ b/tplMirror/umpire_fcompare-debug-second.patch @@ -0,0 +1,17 @@ +*** src/tpl/umpire/src/tpl/CMakeLists.txt 2023-07-06 14:40:05.000000000 -0700 +--- src/tpl/umpire/src/tpl/CMakeLists.txt.patch 2024-01-10 12:16:01.869448000 -0800 +*************** +*** 193,204 **** + endif () + endif () + +- if (C_COMPILER_FAMILY_IS_GNU) +- target_compile_options(umpire_tpl_fmt +- INTERFACE +- $<$:-fcompare-debug-second>) +- endif () +- + install(TARGETS + umpire_tpl_fmt + EXPORT umpire-targets +--- 193,198 ----