Unverified Commit bc48c46d authored by Makayla Shepherd's avatar Makayla Shepherd Committed by GitHub
Browse files

Merge pull request #438 from ihumphrey-usgs/cmake 

isis3.6.0 version update
parents b87dec7c 66785c31

isis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ endif() 


# 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.

install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.5.0${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.5${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.6.0${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.6${SO})")

install(CODE "EXECUTE_PROCESS(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/libisis3.${SO})")

EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/src/base/objs/Preference/TestPreferences ${CMAKE_BINARY_DIR}/)

install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/src/base/objs/Preference/TestPreferences ${CMAKE_INSTALL_PREFIX}/)")

isis/version

+2 −4
Original line number Diff line number Diff line 
3.5.3.0      # Public version number

2018-08-01   # Version date

v007         # 3rd party libraries version

3.6.0        # Public version number

October 2018 # Release date

alpha        # release stage (alpha, beta, stable)