Unverified Commit 06afc21b authored by AustinSanders's avatar AustinSanders Committed by GitHub
Browse files

Version ticks for 3.10.2 stable release (#3852)

* Version tick and prep for 3.10.2 stable release

* replaced missing packages and added explicit versions
parent f1f79fd9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${VERSION}")

# Other release information
string(TIMESTAMP VERSION_DATE "%Y-%m-%d" UTC)
set(RELEASE_STAGE             "beta") # (alpha, beta, stable)
set(RELEASE_STAGE             "stable") # (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")
+5 −9
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 = "3.10.2_RC1" %}
{% set version = "3.10.2" %}

# 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
@@ -50,10 +50,9 @@ requirements:
  - bullet==2.86.1
  - bz2file==0.98
  - bzip2==1.0.6
  - cmake=>3.10
  - cmake>=3.10
  - cspice==66
  - curl==7.60.0
  - doxygen==1.8.14
  - eigen==3.3.3
  - embree==2.14.0
  - geos==3.5.1
@@ -69,7 +68,7 @@ requirements:
  - krb5==1.14.2
  - libpng>=1.6.34
  - libprotobuf==3.5.2
  - libtiff=>4.0.9
  - libtiff>=4.0.9
  - libxml2==2.9.7
  - make
  - mesalib==17.2.0
@@ -77,7 +76,7 @@ requirements:
  - mysql-connector-c==6.1.6
  - nanoflann==1.2.2
  - ninja==1.7.2
  - nn
  - conda-forge/label/gcc7::nn
  - openblas==0.2.19
  - opencv==3.2.0
  - openssl==1.0.2n
@@ -96,7 +95,6 @@ requirements:
  - tnt==126=0
  - wheel==0.30.0
  - x264==20131218
  - xalan-c==1.11
  - xerces-c==3.1.4
  - xorg-kbproto==1.0.7
  - xorg-libice
@@ -113,7 +111,6 @@ requirements:
  - bzip2==1.0.6
  - cspice==66
  - curl==7.60.0
  - doxygen==1.8.14
  - eigen==3.3.3
  - embree==2.14.0
  - geos==3.5.1
@@ -129,7 +126,7 @@ requirements:
  - krb5==1.14.2
  - libpng>=1.6.34
  - libprotobuf==3.5.2
  - libtiff=>4.0.9
  - libtiff>=4.0.9
  - libxml2==2.9.7
  - mesalib==17.2.0
  - mysql==5.7.20
@@ -154,7 +151,6 @@ requirements:
  - tnt==126=0
  - wheel==0.30.0
  - x264==20131218
  - xalan-c==1.11
  - xerces-c==3.1.4
  - xorg-kbproto==1.0.7
  - xorg-libice