Commit e5cd3cde authored by Christine Kim's avatar Christine Kim
Browse files

Builds with cspice

parent e8d49d92

CMakeLists.txt

+4 −7
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ if(SPICEQL_BUILD_LIB) 
                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking1.json

                           ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/viking2.json)



  

  set(SPICEQL_KERNELS ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/db/kernels/naif0011.tls)



  add_library(SpiceQL SHARED ${SPICEQL_SRC_FILES})
@@ -107,7 +106,6 @@ if(SPICEQL_BUILD_LIB) 
                                  VERSION ${PROJECT_VERSION}

                                  SOVERSION 0)





  target_compile_definitions(SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE 

                                     PUBLIC -D_SOURCE_PREFIX="${CMAKE_CURRENT_SOURCE_DIR}")
@@ -128,7 +126,7 @@ if(SPICEQL_BUILD_LIB) 
                        nlohmann_json::nlohmann_json

                        PRIVATE

                        redis++ 

                        CSpice::cspice

                        cspice

                        spdlog::spdlog_header_only

                        )
@@ -153,9 +151,8 @@ if(SPICEQL_BUILD_LIB) 
  # Install the shipped kernels

  install(FILES ${SPICEQL_KERNELS} DESTINATION "etc/SpiceQL/db/kernels")





  # Install the library

  install(TARGETS SpiceQL nlohmann_json

  install(TARGETS SpiceQL nlohmann_json ghc_filesystem

          EXPORT spiceQLTargets

          LIBRARY  DESTINATION ${CMAKE_INSTALL_LIBDIR}

          INCLUDES DESTINATION ${SPICEQL_INSTALL_INCLUDE_DIR})

SpiceQL/src/io.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <fmt/format.h>



#include "SpiceUsr.h"

#include <SpiceUsr.h>



#include "io.h"

#include "utils.h"

SpiceQL/tests/CMakeLists.txt

+6 −1
Original line number Diff line number Diff line
@@ -7,7 +7,12 @@ else() 
  set(CMAKE_CXX_STANDARD 17)

endif()



find_package(CSpice REQUIRED)



get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)

foreach(dir ${dirs})

  message(STATUS "dir='${dir}'")

endforeach()

set(SPICEQL_TEST_DIRECTORY ${CMAKE_SOURCE_DIR}/SpiceQL/tests/)



# collect all of the test sources
@@ -30,7 +35,7 @@ target_link_libraries(runSpiceQLTests 
                      PRIVATE

                      SpiceQL

                      redis++

                      CSpice::cspice

                      cspice

                      gtest

                      gmock

                      Threads::Threads

SpiceQL/tests/KernelTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#include "spice_types.h"

#include "query.h"



#include "SpiceUsr.h"

#include <SpiceUsr.h>



#include "spdlog/spdlog.h"

SpiceQL/tests/UtilTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ using namespace std::chrono; 
#include "Fixtures.h"

#include "spice_types.h"

#include "config.h"

#include "SpiceUsr.h"

#include <SpiceUsr.h>

#include "memo.h"

#include "query.h"