Skip to content

Using updated cspice #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acpaquette merged 5 commits into from
Sep 23, 2025
Merged

Using updated cspice #103

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
819127e
working with new cspice
chkim-usgs Sep 12, 2025
01a693d
update changelog
chkim-usgs Sep 15, 2025
c63407d
Merge branch 'main' into cspice_cmake
chkim-usgs Sep 23, 2025
7fbefe7
Update CMakeLists.txt
chkim-usgs Sep 23, 2025
55741f4
fix tests
chkim-usgs Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 6 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -136,11 +136,14 @@ 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>
${CSPICE_INCLUDE_DIRS}
Copy link
Collaborator

@acpaquette acpaquette Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be "Public"? Can it be "Private"? I just worry about polluting the includes for other packages

Copy link
Collaborator Author

@chkim-usgs chkim-usgs Sep 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that's ok, I'll change it to private.

PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/submodules/BTree/include/
cereal
Expand All @@ -151,7 +154,7 @@ target_include_directories(SpiceQL
fmt::fmt-header-only
nlohmann_json::nlohmann_json
PRIVATE
cspice
CSPICE::cspice
spdlog::spdlog_header_only
HighFive
${CURL_LIBRARIES}
Expand Down
2 changes: 1 addition & 1 deletion SpiceQL/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
21 changes: 0 additions & 21 deletions cmake/FindCSpice.cmake
View file
Open in desktop

This file was deleted.

Loading