From 76293dffae95609f029383830e2dc57c1adcc9c4 Mon Sep 17 00:00:00 2001
From: Christine Kim <chkim@usgs.gov>
Date: Thu, 28 Sep 2023 12:16:55 -0700
Subject: [PATCH] Update files for conda build
---
CMakeLists.txt | 3 ++-
cmake/FindCereal.cmake | 2 +-
environment.yml | 5 ++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e0e480..e2594c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,6 +60,7 @@ if(SPICEQL_BUILD_LIB)
find_package(fmt REQUIRED)
find_package(cereal REQUIRED)
find_package(spdlog REQUIRED)
+ find_package(hiredis REQUIRED)
set(SPICEQL_INSTALL_INCLUDE_DIR "include/SpiceQL")
set(SPICEQL_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spiceql.cpp
@@ -109,7 +110,7 @@ if(SPICEQL_BUILD_LIB)
target_compile_definitions(SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE
PUBLIC -D_SOURCE_PREFIX="${CMAKE_CURRENT_SOURCE_DIR}")
- message(STATUS "redis++ inc: " ${hiredis_INCLUDE_DIRS})
+ message(STATUS "redis++ inc: " ${HIREDIS_INCLUDE_DIRS})
target_include_directories(SpiceQL
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/include>
diff --git a/cmake/FindCereal.cmake b/cmake/FindCereal.cmake
index 045c20e..e070c10 100644
--- a/cmake/FindCereal.cmake
+++ b/cmake/FindCereal.cmake
@@ -12,7 +12,7 @@ find_path(CEREAL_INCLUDE_DIR cereal
set(CEREAL_INCLUDE_DIRS ${CEREAL_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Cereal DEFAULT_MSG CEREAL_INCLUDE_DIR)
+find_package_handle_standard_args(cereal DEFAULT_MSG CEREAL_INCLUDE_DIR)
mark_as_advanced(CEREAL_INCLUDE_DIR)
diff --git a/environment.yml b/environment.yml
index bfbd9f9..4ca540e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -2,14 +2,13 @@ channels:
- defaults
- conda-forge
- usgs-astrogeology
- - tudat-team
-
+
dependencies:
- cmake
- cspice
- cpp-filesystem
- doxygen
- - fmt
+ - fmt==9.1.0
- libhiredis
- ninja
- pip
--
GitLab