Unverified Commit 2e8de637 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Changed 'version' filename to honor reserved keyword. (#5434) 

* Changed 'version' filename to honor cmake reserved keyword.

Changed 'version' filename to isis_version.txt. 'version' is a reserved
keyword in cmake.  Additionally, the extension should prevent this file
from being compiled as source, and eliminate the recompilation error.

* Updated changelog

* Reverted accidental change to version

* Updated version file name
parent b6c073fe

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ release. 




### Fixed

- Fixed a bug in which 'version' file was compiled as source and prevented subsequent ISIS recompilation [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)

- Fixed <i>noproj</i> bug where some temporary files were not deleted after call to cam2cam.  Issue: [#4813](https://github.com/USGS-Astrogeology/ISIS3/issues/4813)

- Fixed <i>noproj</i> bug where missing shapemodel-related keywords (RayTraceEngine, BulletParts, Tolerance) are dropped when the output label is created. This resulted in the Bullet collision detection engine not being used. Issue: [#5377](https://github.com/USGS-Astrogeology/ISIS3/issues/5377)

- Fixed ISIS failing to expand env variables with an "_" in them. [#5402](https://github.com/DOI-USGS/ISIS3/pull/5402)

isis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ set(sourceXmlFolder ${CMAKE_BINARY_DIR}/bin/xml) 
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)



# Create the version file

configure_file(${CMAKE_SOURCE_DIR}/cmake/version.in ${CMAKE_BINARY_DIR}/version)

configure_file(${CMAKE_SOURCE_DIR}/cmake/version.in ${CMAKE_BINARY_DIR}/isis_version.txt)



# Set up install of the make folder.

install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX})
@@ -594,7 +594,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/IsisPreferences DESTINATION ${CMAKE_INSTA 
install(FILES     ${CMAKE_SOURCE_DIR}/../LICENSE.md   DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(FILES     ${CMAKE_SOURCE_DIR}/../AUTHORS.rst  DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(FILES     ${CMAKE_SOURCE_DIR}/../CHANGELOG.md DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(FILES     ${CMAKE_BINARY_DIR}/version         DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(FILES     ${CMAKE_BINARY_DIR}/isis_version.txt DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(DIRECTORY ${CMAKE_SOURCE_DIR}/scripts         DESTINATION  ${CMAKE_INSTALL_PREFIX})

install(PROGRAMS ${CMAKE_BINARY_DIR}/lib/Camera.plugin DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)

install(PROGRAMS ${CMAKE_SOURCE_DIR}/scripts/downloadIsisData DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/)

isis/src/base/objs/Environment/Environment.cpp

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ namespace Isis { 
   * @returns the Isis version in the format isis?.?.?.?qualifier | date

   */

  QString Environment::isisVersion() {

    TextFile versionFile("$ISISROOT/version");

    TextFile versionFile("$ISISROOT/isis_version.txt");

    QString line1, line2, line3, line4;

    versionFile.GetLine(line1);

    versionFile.GetLine(line2);