From e15cb552bc66e5860b80af321ca53b10b00068bc Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Thu, 5 Dec 2019 16:08:55 -0600
Subject: [PATCH] modified: CMakeLists.txt
---
CMakeLists.txt | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc4d50a5..df24ae29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,7 @@ set(EXTVERS .6-devel)
set(CMAKE_MODULE_PATH
${PROJECT_SOURCE_DIR}/cmake/Modules
${CMAKE_MODULE_PATH}
- ${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}
- /usr/local
- /usr/local/lib
)
include(PoddCMakeEnv)
@@ -45,18 +42,20 @@ endif()
#jelse()
get_target_property(FMT_INCLUDE_DIR fmt::fmt INTERFACE_INCLUDE_DIRECTORIES)
add_definitions(-DSPDLOG_FMT_EXTERNAL )
+set(SPDLOG_FMT_EXTERNAL TRUE)
#find_package(fmt QUIET)
-find_package(spdlog REQUIRED)
-#if(NOT spdlog_FOUND)
-# message("spdlog not found.")
-# message("Using builtin spdlog.")
-# set(SPDLOG_FMT_EXTERNAL TRUE)
-# add_subdirectory(src/3rd_party/spdlog)
-# set(SPDLOG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rd_party/spdlog/include)
-#else()
-# get_target_property(SPDLOG_INCLUDE_DIR spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
-#endif()
+
+find_package(spdlog QUIET)
+if(NOT spdlog_FOUND)
+ message("spdlog not found.")
+ message("Using builtin spdlog.")
+ set(SPDLOG_FMT_EXTERNAL TRUE)
+ add_subdirectory(src/3rd_party/spdlog)
+ set(SPDLOG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rd_party/spdlog/include)
+else()
+ get_target_property(SPDLOG_INCLUDE_DIR spdlog::spdlog INTERFACE_INCLUDE_DIRECTORIES)
+endif()
#message( "SPDLOG_INCLUDE_DIR ${SPDLOG_INCLUDE_DIR}")
--
GitLab