diff --git a/CHANGELOG.md b/CHANGELOG.md index 6973ed0f1b..441db463c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,6 +63,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github - Changed `StripPolygonSeeder` and `GridPolygonSeeder` to seed individual polygons within each images multipolygon footprint [#5193](https://github.com/DOI-USGS/ISIS3/issues/5193) - Pinned SpiceQL to 1.2.0 [#5852](https://github.com/DOI-USGS/ISIS3/pull/5852) - Changed `ControlMeasure` object comparison to no longer factor in creation date for equality [#5862](https://github.com/DOI-USGS/ISIS3/pull/5862) +- Updated cmake configs to accommodate new cspice release [#5886](https://github.com/DOI-USGS/ISIS3/pull/5886) ### Fixed - Fixed kaguyatc2isis invalid BandBin values [#5629](https://github.com/DOI-USGS/ISIS3/issues/5629) diff --git a/environment.yml b/environment.yml index e58e7ac211..8f6fea9057 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - bz2file - bzip2 - cmake >=3.27,<3.28 - - cspice =67 + - cspice =67=*_11 - csm >=3.0.3,<3.0.4 - curl >=8.14.1,<9 - cxx-compiler=1.7 @@ -64,7 +64,7 @@ dependencies: - qhull - qt-main>=5.15, <5.16 - qwt <6.3.0 - - spiceql =1.2.0 + - spiceql =1.2.0=*_1 - sqlite >=3.46.0,<3.47 - suitesparse <7.7.0 - superlu diff --git a/environment_arm.yml b/environment_arm.yml index 04ea22f6c4..9a20ae94dd 100644 --- a/environment_arm.yml +++ b/environment_arm.yml @@ -13,7 +13,7 @@ dependencies: - bz2file - bzip2 - cmake >=3.27,<3.28 - - cspice =67 + - cspice =67=*_11 - csm >=3.0.3,<3.0.4 - curl >=8.4.0,<8.5 - cxx-compiler=1.7 @@ -61,7 +61,7 @@ dependencies: - qhull - qt-main>=5.15, <5.16 - qwt <6.3.0 - - spiceql =1.2.0 + - spiceql =1.2.0=*_1 - sqlite >=3.46.0,<3.47 - suitesparse <7.7.0 - superlu diff --git a/environment_arm_linux.yml b/environment_arm_linux.yml index 1b80d62bc0..cb03ce7009 100644 --- a/environment_arm_linux.yml +++ b/environment_arm_linux.yml @@ -12,7 +12,7 @@ dependencies: - bz2file - bzip2 - cmake >=3.27,<3.28 - - cspice =67 + - cspice =67=*_11 #- csm >=3.0.3,<3.0.4 - curl >=8.4.0,<8.5 - cxx-compiler=1.7 @@ -60,7 +60,7 @@ dependencies: - qhull - qt-main>=5.15, <5.16 - qwt <6.3.0 - - spiceql =1.2.0 + - spiceql =1.2.0=*_1 - sqlite >=3.46.0,<3.47 - suitesparse <7.7.0 - superlu diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index cc5bcecdfe..b7fc3aa4c8 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -292,7 +292,7 @@ find_package(Json REQUIRED) find_package(BulletFloat64 REQUIRED) find_package(Cholmod 4.4.5 REQUIRED) find_package(CSM 3.0.3.3 REQUIRED) -find_package(CSPICE 65 REQUIRED) +find_package(cspice 67 REQUIRED) find_package(Eigen REQUIRED) find_package(Embree 3.13.0 REQUIRED) find_package(GDAL REQUIRED CONFIG) @@ -384,7 +384,7 @@ foreach (_variableName ${_variableNames}) endforeach() # add target based linkages to ALLLIBS variable -list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL) +list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree GDAL::GDAL CSPICE::cspice) # Sometimes we add the same lib more than once (especially with LIBDIRS) list(REMOVE_DUPLICATES ALLLIBDIRS) @@ -394,6 +394,10 @@ list(REMOVE_DUPLICATES ALLINCDIRS) #=============================================================================== #=============================================================================== + +get_target_property(CSPICE_INCLUDE_DIRS CSPICE::cspice INTERFACE_INCLUDE_DIRECTORIES) +list(APPEND ALLLIBDIRS ${CSPICE_INCLUDE_DIRS}) + # Start setting up the build # Add extension to find fortran until .so symlink can be added to /usr/lib64 list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES .so.3 .so.6 .so.5) @@ -403,6 +407,7 @@ include_directories(SYSTEM ${ALLINCDIRS}) link_directories(${ALLLIBDIRS}) include_directories(${CMAKE_BINARY_DIR}/inc) + set(CORE_LIB_NAME isis) message(STATUS "CORE LIB: ${CORE_LIB_NAME}") diff --git a/isis/cmake/FindCSPICE.cmake b/isis/cmake/FindCSPICE-disabled.cmake similarity index 100% rename from isis/cmake/FindCSPICE.cmake rename to isis/cmake/FindCSPICE-disabled.cmake diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ec686ca9f2..109853d746 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -55,7 +55,7 @@ requirements: - bz2file - bzip2 - cmake >=3.27,<3.28 - - cspice =67 + - cspice =67=*_11 - usgs-astrogeology::csm >=3.0.3,<3.0.4 # [osx and arm64] - csm >=3.0.3,<3.0.4 # [not (osx and arm64)] - curl >=8.14.1,<9 @@ -106,7 +106,7 @@ requirements: - qhull - qt-main >=5.15,<5.16 - qwt <6.3.0 - - spiceql =1.2.0 + - spiceql =1.2.0=*_1 - sqlite >=3.46.0,<3.47 - suitesparse <7.7.0 - superlu @@ -136,7 +136,7 @@ requirements: - bz2file - usgs-astrogeology::csm # [osx and arm64] - csm # [not (osx and arm64)] - - cspice + - cspice=67=*_11 - curl - eigen - {{ pin_compatible('embree', min_pin='x.x', max_pin='x.x') }}