Skip to content

Commit 474e3e2

Browse files
Using updated cspice (#5886)
* Use new cspice * update changelog * Force cspice version to pick up build 11 * Fixed up cmake for new cspice target * Update meta.yaml * Fix remaining merge conflicts * Add CONFIG to cspice find_package * Remove build specific version of cspice in environment files --------- Co-authored-by: acpaquette <[email protected]>
1 parent 623cd2c commit 474e3e2

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github
6969
- Improved the Conda Bullet CMAKE configuration in FindBulletFloat64.cmake. Adds the Bullet::Bullet_double target to ALLLIBS. [#5899](https://github.com/DOI-USGS/ISIS3/issues/5899)
7070
- Changed 'jigsaw' attribute type to account for Linux compiler changes [#5904](https://github.com/DOI-USGS/ISIS3/pull/5904)
7171
- Updated GDAL to 3.12 and QT to 6.X [#5909](https://github.com/DOI-USGS/ISIS3/pull/5909)
72-
72+
- Updated cmake configs to accommodate new cspice release [#5886](https://github.com/DOI-USGS/ISIS3/pull/5886)
7373

7474
### Fixed
7575
- Fixed Chandrayaan-2 TMC2 serial numbers by setting InstrumentId to CH2_TMC_FORE/NADIR/AFT based on the filename sensor [#5871](https://github.com/DOI-USGS/ISIS3/issues/5871)

isis/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ find_package(Json REQUIRED)
292292
find_package(BulletFloat64 REQUIRED)
293293
find_package(Cholmod 4.4.5 REQUIRED)
294294
find_package(CSM 3.0.3.3 REQUIRED)
295-
find_package(CSPICE 65 REQUIRED)
295+
find_package(cspice 67 REQUIRED CONFIG)
296296
find_package(Eigen REQUIRED)
297297
find_package(Embree 3.13.0 REQUIRED)
298298
find_package(GDAL REQUIRED CONFIG)
@@ -394,7 +394,7 @@ foreach (_variableName ${_variableNames})
394394
endforeach()
395395

396396
# add target based linkages to ALLLIBS variable
397-
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL Bullet::Bullet_double)
397+
list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL Bullet::Bullet_double CSPICE::cspice)
398398

399399
# Sometimes we add the same lib more than once (especially with LIBDIRS)
400400
list(REMOVE_DUPLICATES ALLLIBDIRS)
@@ -404,6 +404,10 @@ list(REMOVE_DUPLICATES ALLINCDIRS)
404404
#===============================================================================
405405
#===============================================================================
406406

407+
408+
get_target_property(CSPICE_INCLUDE_DIRS CSPICE::cspice INTERFACE_INCLUDE_DIRECTORIES)
409+
list(APPEND ALLLIBDIRS ${CSPICE_INCLUDE_DIRS})
410+
407411
# Start setting up the build
408412
# Add extension to find fortran until .so symlink can be added to /usr/lib64
409413
list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3 .so.6 .so.5)
@@ -413,6 +417,7 @@ include_directories(SYSTEM ${ALLINCDIRS})
413417
link_directories(${ALLLIBDIRS})
414418

415419
include_directories(${CMAKE_BINARY_DIR}/inc)
420+
416421
set(CORE_LIB_NAME isis)
417422
message(STATUS "CORE LIB: ${CORE_LIB_NAME}")
418423

0 commit comments

Comments
 (0)