Update apollopaninit call

DOI-USGS · Jan 28, 2025 · c0e6ad4 · c0e6ad4
1 parent e5f80b3
commit c0e6ad4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/environment.yml b/environment.yml
@@ -58,7 +58,7 @@ dependencies:
   - qhull
   - qt-main>=5.15.8, <5.16
   - qwt <6.3.0
-  - spiceql =1.0.1
+  # - spiceql
   - sqlite >=3.46.0,<3.47
   - suitesparse <7.7.0
   - superlu

diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt
@@ -275,7 +275,7 @@ find_package(Jama      125     REQUIRED)
 find_package(NN                REQUIRED)
 find_package(OpenCV    3.1.0   REQUIRED)
 find_package(PCL               REQUIRED)
-find_package(Protobuf          REQUIRED)
+find_package(Protobuf          REQUIRED CONFIG)
 find_package(Qwt       6       REQUIRED)
 find_package(SuperLU   4.3     REQUIRED)
 find_package(SpiceQL           REQUIRED)
@@ -295,6 +295,7 @@ find_package(inja              REQUIRED)
 if(buildTests)
   set(INSTALL_GTEST OFF)
   add_subdirectory(../gtest gtest)
+  add_subdirectory(../gmock-global gmock-global)
 else()
   set(SENSOR_UTILITIES_BUILD_TESTS OFF CACHE BOOL "Disable SensorUtilities Tests")
 endif()

diff --git a/isis/src/apollo/apps/apollopaninit/main.cpp b/isis/src/apollo/apps/apollopaninit/main.cpp
@@ -240,7 +240,7 @@ void IsisMain() {
   std::string frameName;
   SpiceInt frameCode = 0;
   try{
-    json output = Isis::RestfulSpice::getTargetFrameInfo(301, "base");
+    json output = Isis::RestfulSpice::getTargetFrameInfo(301, mission.toLower().toStdString());
     frameCode = output["frameCode"].get<SpiceInt>();
     frameName = output["frameName"].get<std::string>();
   }catch(std::invalid_argument){
@@ -251,7 +251,7 @@ void IsisMain() {
       throw IException(IException::Io, msg, _FILEINFO_);
     }
   }
-
+  
 
   spRot = new SpiceRotation(frameCode);
   //create a table from starttime to endtime (streched by 3%) with NODES entries

diff --git a/isis/tests/CMakeLists.txt b/isis/tests/CMakeLists.txt
@@ -45,6 +45,6 @@ add_executable(runISISTests
                IsisTestMain.cpp
                ${test_source})
 
-target_link_libraries(runISISTests isis ${MISSION_LIBS} ${ALLLIBS} gmock_main)
+target_link_libraries(runISISTests isis ${MISSION_LIBS} ${ALLLIBS} gmock-global::gmock-global gmock_main)
 
 gtest_discover_tests(runISISTests WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests PROPERTIES DISCOVERY_TIMEOUT 6000)