Commit 76293dff authored by Christine Kim's avatar Christine Kim
Browse files

Update files for conda build

parent 5b47af7b

CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -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>

cmake/FindCereal.cmake

+1 −1
Original line number Diff line number Diff line
@@ -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)

environment.yml

+2 −3
Original line number Diff line number Diff line
@@ -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