From fa9c02934fb79429d94b01ffb98e5d40b62d3511 Mon Sep 17 00:00:00 2001 From: Murat Keceli Date: Thu, 8 Jul 2021 11:30:51 -0500 Subject: [PATCH 1/2] Fix the path for MADNESS config.h This is required when MADNESS_ROOT_DIR is set. --- external/madness.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/madness.cmake b/external/madness.cmake index a3dddd0f0f..0f23e1a0a6 100644 --- a/external/madness.cmake +++ b/external/madness.cmake @@ -32,7 +32,7 @@ if (MADNESS_FOUND AND NOT TILEDARRAY_DOWNLOADED_MADNESS) set(TILEDARRAY_DOWNLOADED_MADNESS OFF CACHE BOOL "Whether TA downloaded MADNESS") mark_as_advanced(TILEDARRAY_DOWNLOADED_MADNESS) - set(CONFIG_H_PATH "${MADNESS_DIR}/../../../include/madness/config.h") + set(CONFIG_H_PATH "${MADNESS_DIR}/src/madness/config.h") if (NOT EXISTS "${CONFIG_H_PATH}") message(FATAL_ERROR "did not find MADNESS' config.h") endif() From 66095d1e28cb4f19beb0f39b72733e48ae3b2745 Mon Sep 17 00:00:00 2001 From: Murat Keceli Date: Thu, 8 Jul 2021 12:20:58 -0500 Subject: [PATCH 2/2] Adding an alternative path for config.h so that MADNESS_ROOT_DIR can be set to MADNESS install directory or build directory --- external/madness.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/external/madness.cmake b/external/madness.cmake index 0f23e1a0a6..a5ff7ea878 100644 --- a/external/madness.cmake +++ b/external/madness.cmake @@ -32,9 +32,12 @@ if (MADNESS_FOUND AND NOT TILEDARRAY_DOWNLOADED_MADNESS) set(TILEDARRAY_DOWNLOADED_MADNESS OFF CACHE BOOL "Whether TA downloaded MADNESS") mark_as_advanced(TILEDARRAY_DOWNLOADED_MADNESS) - set(CONFIG_H_PATH "${MADNESS_DIR}/src/madness/config.h") + set(CONFIG_H_PATH "${MADNESS_DIR}/../../../include/madness/config.h") # if MADNESS were installed if (NOT EXISTS "${CONFIG_H_PATH}") - message(FATAL_ERROR "did not find MADNESS' config.h") + set(CONFIG_H_PATH "${MADNESS_DIR}/src/madness/config.h") # if MADNESS were used from build tree + if (NOT EXISTS "${CONFIG_H_PATH}") + message(FATAL_ERROR "did not find MADNESS' config.h") + endif() endif() file(STRINGS "${CONFIG_H_PATH}" MADNESS_REVISION_LINE REGEX "define MADNESS_REVISION") if (MADNESS_REVISION_LINE) # MADNESS_REVISION found? make sure it matches the required tag exactly