Unverified Commit 6f717c89 authored by Stuart Sides's avatar Stuart Sides Committed by GitHub
Browse files

Upstream/7.0 (#4799) 

* Updates for 7.0 RC1

* Temp update for location

* Fix extra spaces
parent cfd25431

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}") 


# Other release information

string(TIMESTAMP VERSION_DATE "%Y-%m-%d" UTC)

set(RELEASE_STAGE             "alpha") # (alpha, beta, stable)

set(RELEASE_STAGE             "beta") # (alpha, beta, stable)



# Define to the address where bug reports for this package should be sent.

set(PACKAGE_BUGREPORT  "https://github.com/USGS-Astrogeology/ISIS3/issues")

isis/cmake/FindKakadu.cmake

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
if(JP2KFLAG)

  find_path(KAKADU_INCLUDE_DIR

    NAME kdu_kernels.h

    PATHS /usgs/apps/kakadu/v7_9_1-01762L/managed/all_includes/ /isisData/kakadu/

    PATHS /usgs/apps/kakadu/v7_9_1-01762L/managed/all_includes/ /isisData/kakadu/ /Users/ssides/oldmac//kakadu/v7_9_1-01762L/coresys/common/



  )

recipe/meta.yaml

+64 −64
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#       A Public Release for ISIS3.6.1:                        {% set version = "3.6.1" %}

#       A Release Candidate for ISIS3.6.1:                     {% set version = "3.6.1_RC" %}

#       A custom build of ISIS3.6.1 for the CaSSIS mission:    {% set version = "3.6.1_cassis" %}

{% set version = "7.0.0" %}

{% set version = "7.0.0_RC1" %}



# This is the build number for the current version you are building. If this is the first build of

# this version, the build number will be 0. It is incremented by 1 with every consecutive build of