Commit 41381caa authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

totally don't remember what I changed

parent 948c7e3f

isis/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ message("Detected Operating System: ${osVersionString}") 
#  as a static library using some specialized code in Utilities.cmake.

set(BUILD_SHARED_LIBS ON)



# make sure to leave rpaths untouched on install 

set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)



# Specify user options that can be passed in with the initial CMake command.

option(isis3Data       "Directory containing Isis3Data"                 OFF )

option(isis3TestData   "Directory containing Isis3TestData"             OFF )
@@ -349,7 +352,6 @@ if(APPLE) 
else()

  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};$ORIGIN/../lib;$ORIGIN/../3rdParty/lib")

endif()

set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)



# We will set up some links with these files at the end of the install process so

#  make sure they are cleared at the start of the install process.

isis/src/control/apps/seedgrid/tsts/errors/errors.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
[2018-03-21 14:12:04]  Failed ... No truth folder or files

isis/src/control/objs/BundleUtilities/BundleObservationSolveSettings.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ class BundleObservationSolveSettings { 
                                         double positionAprioriSigma = -1.0,

                                         double velocityAprioriSigma = -1.0,

                                         double accelerationAprioriSigma = -1.0);

                                         

      InstrumentPositionSolveOption instrumentPositionSolveOption() const;

      int spkDegree() const;

      int spkSolveDegree() const;

isis/sipfiles/ControlPoint.sip

+2 −2

File changed.

Contains only whitespace changes.