Using updated cspice (#103)

* working with new cspice

* update changelog

* Update CMakeLists.txt

* fix tests

Author: chkim-usgs

CHANGELOG.md

@@ -40,6 +40,7 @@ release.
 ### Changed
 - Refactored FastAPI models and added OpenAPI examples [#96](https://github.com/DOI-USGS/SpiceQL/pull/96)
 - Pinned cspice to 67 [#102](https://github.com/DOI-USGS/SpiceQL/pull/102)
+- Update cmake files to accommodate new cspice package that uses the new cmake recipe [#103](https://github.com/DOI-USGS/SpiceQL/pull/103)
 
 ### Added
 - Added relative kernel path support for furnishing [#100](https://github.com/DOI-USGS/SpiceQL/pull/100)

CMakeLists.txt

@@ -55,7 +55,7 @@ if(SPICEQL_BUILD_LIB)
   add_subdirectory("submodules/gularkfilesystem")
   add_subdirectory("submodules/json")
 
-  find_package(CSpice REQUIRED)
+  find_package(cspice REQUIRED)
   find_package(fmt REQUIRED)
   find_package(cereal REQUIRED)
   find_package(spdlog REQUIRED)
@@ -136,22 +136,25 @@ if(SPICEQL_BUILD_LIB)
 
   target_compile_definitions(SpiceQL PRIVATE SPDLOG_ACTIVE_LEVEL=SPDLOG_LEVEL_TRACE 
                                      PUBLIC -D_SOURCE_PREFIX="${CMAKE_CURRENT_SOURCE_DIR}")
-  
+
+get_target_property(CSPICE_INCLUDE_DIRS CSPICE::cspice INTERFACE_INCLUDE_DIRECTORIES)
+
 target_include_directories(SpiceQL
                             PUBLIC
                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/include>
                             $<INSTALL_INTERFACE:include>
                             PRIVATE
                             ${CMAKE_CURRENT_SOURCE_DIR}/submodules/BTree/include/
                             cereal
+                            ${CSPICE_INCLUDE_DIRS}
                             )
 
   target_link_libraries(SpiceQL
                         PUBLIC
                         fmt::fmt-header-only
                         nlohmann_json::nlohmann_json
                         PRIVATE
-                        cspice
+                        CSPICE::cspice
                         spdlog::spdlog_header_only
                         HighFive
                         ${CURL_LIBRARIES}

SpiceQL/tests/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10)
 # A lot of linux OSes do not support C++20
 set(CMAKE_CXX_STANDARD 20)
 
-find_package(CSpice REQUIRED)
+find_package(cspice REQUIRED)
 
 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
 foreach(dir ${dirs})
@@ -30,7 +30,7 @@ target_compile_definitions(runSpiceQLTests PUBLIC SPDLOG_ACTIVE_LEVEL=SPDLOG_LEV
 target_link_libraries(runSpiceQLTests
                       PRIVATE
                       SpiceQL
-                      cspice
+                      CSPICE::cspice
                       gtest
                       gmock
                       Threads::Threads
@@ -40,6 +40,7 @@ target_link_libraries(runSpiceQLTests
 
 
 target_include_directories(runSpiceQLTests PRIVATE ${CMAKE_SOURCE_DIR}/submodules/hippomocks/ 
-                                                   ${CMAKE_SOURCE_DIR}/submodules/BTree/include/)
+                                                   ${CMAKE_SOURCE_DIR}/submodules/BTree/include/
+                                                   ${CSPICE_INCLUDE_DIRS})
 
 gtest_discover_tests(runSpiceQLTests WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/SpiceQL/tests/)