Skip to content

Commit

Permalink
Explicitly set the search name for Cereal to be all lowercase. (LLNL#…
Browse files Browse the repository at this point in the history
  • Loading branch information
benson31 committed Nov 22, 2021
1 parent 94bac33 commit 36daf09
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,13 @@ find_package(Threads REQUIRED)
find_package(Clara REQUIRED)

find_package(CEREAL NO_MODULE
NAMES cereal
HINTS ${CEREAL_DIR} $ENV{CEREAL_DIR}
PATH_SUFFIXES share/cmake/cereal
NO_DEFAULT_PATH)
if (NOT CEREAL_FOUND)
find_package(CEREAL NO_MODULE REQUIRED)
find_package(CEREAL NO_MODULE REQUIRED
NAMES cereal)
endif ()
set(LBANN_HAS_CEREAL ${CEREAL_FOUND})
# The imported target is just called "cereal". Super.
Expand Down
5 changes: 3 additions & 2 deletions cmake/configure_files/LBANNConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,16 @@ endif ()

if (LBANN_HAS_CEREAL)
find_package(CEREAL NO_MODULE QUIET
NAMES cereal
HINTS ${CEREAL_DIR} $ENV{CEREAL_DIR}
PATH_SUFFIXES share/cmake/cereal
NO_DEFAULT_PATH)
if (NOT CEREAL_FOUND)
find_package(CEREAL NO_MODULE QUIET)
find_package(CEREAL NO_MODULE QUIET NAMES cereal)
endif ()
if (NOT CEREAL_FOUND AND NOT CEREAL_DIR)
set(CEREAL_DIR "@CEREAL_DIR@")
find_package(CEREAL NO_MODULE REQUIRED)
find_package(CEREAL NO_MODULE REQUIRED NAMES cereal)
endif ()
if (NOT CEREAL_FOUND)
message(FATAL_ERROR "Required dependency CEREAL not found.")
Expand Down

0 comments on commit 36daf09

Please sign in to comment.