Skip to content
Snippets Groups Projects
Commit 76293dff authored by Christine Kim's avatar Christine Kim
Browse files

Update files for conda build

parent 5b47af7b
No related branches found
No related tags found
No related merge requests found
...@@ -60,6 +60,7 @@ if(SPICEQL_BUILD_LIB) ...@@ -60,6 +60,7 @@ if(SPICEQL_BUILD_LIB)
find_package(fmt REQUIRED) find_package(fmt REQUIRED)
find_package(cereal REQUIRED) find_package(cereal REQUIRED)
find_package(spdlog REQUIRED) find_package(spdlog REQUIRED)
find_package(hiredis REQUIRED)
set(SPICEQL_INSTALL_INCLUDE_DIR "include/SpiceQL") set(SPICEQL_INSTALL_INCLUDE_DIR "include/SpiceQL")
set(SPICEQL_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spiceql.cpp set(SPICEQL_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spiceql.cpp
...@@ -109,7 +110,7 @@ if(SPICEQL_BUILD_LIB) ...@@ -109,7 +110,7 @@ if(SPICEQL_BUILD_LIB)
target_compile_definitions(SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE target_compile_definitions(SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE
PUBLIC -D_SOURCE_PREFIX="${CMAKE_CURRENT_SOURCE_DIR}") 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 target_include_directories(SpiceQL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/include>
......
...@@ -12,7 +12,7 @@ find_path(CEREAL_INCLUDE_DIR cereal ...@@ -12,7 +12,7 @@ find_path(CEREAL_INCLUDE_DIR cereal
set(CEREAL_INCLUDE_DIRS ${CEREAL_INCLUDE_DIR}) set(CEREAL_INCLUDE_DIRS ${CEREAL_INCLUDE_DIR})
include(FindPackageHandleStandardArgs) 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) mark_as_advanced(CEREAL_INCLUDE_DIR)
......
...@@ -2,14 +2,13 @@ channels: ...@@ -2,14 +2,13 @@ channels:
- defaults - defaults
- conda-forge - conda-forge
- usgs-astrogeology - usgs-astrogeology
- tudat-team
dependencies: dependencies:
- cmake - cmake
- cspice - cspice
- cpp-filesystem - cpp-filesystem
- doxygen - doxygen
- fmt - fmt==9.1.0
- libhiredis - libhiredis
- ninja - ninja
- pip - pip
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment