Unverified Commit 0df50dfa authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

8.2 fix (#5542) 

* Fixed double free issues on ubuntu 18.04 when running some gtests (#5510)

* Updated env file

* Change Protobuf find_package call

* Refined meta.yml and environment.yml

* Reset meta.yml version
parent 89be2bc3

environment.yml

+34 −33
Original line number Diff line number Diff line
@@ -3,68 +3,69 @@ channels: 
  - defaults



dependencies:

  - ale>=0.10.0, <1

  - ale =0.10.0,<1

  - aom

  - armadillo

  - boost>=1.72.0, <2

  - boost-cpp>=1.72.0, <2

  - boost >=1.78.0,<1.79

  - boost-cpp >=1.78.0,<1.79

  - blas

  - usgs-astrogeology::bullet

  - bz2file

  - bzip2

  - cmake >=3.15, <4

  - cmake >=3.27,<3.28

  - cspice =67

  - csm >=3.0.3,<3.0.4

  - curl>=8.3.0,<9.0a0

  - cxx-compiler>=1.1.2

  - curl >=8.4.0,<8.5

  - cxx-compiler=1.1.2

  - doxygen

  - eigen >=3, <4

  - embree >=3, <4

  - ffmpeg

  - geos>=3.12.1, <4

  - geos >=3.12, <3.13

  - geotiff

  - gmp

  - graphviz

  - gsl>=2.6

  - hdf5>=1.14.2,<1.14.3.0a0

  - conda-forge::gsl >=2.6, <2.7

  - hdf5

  - icu

  - inja

  - jama

  - usgs-astrogeology::kakadu==1

  - kalasiris

  - krb5

  - libboost>=1.72.0, <2

  - libgdal >=3.7.2,<3.8.0a0

  - libopencv>=4.5.2, <5

  - libpng>=1.6.34, <2

  - libgdal >=3.7,<3.8

  - libopencv >=4.7,<4.8

  - libpng >=1.6.34,<1.7

  - libprotobuf

  - libtiff>=4.0, <5

  - libtiff >=4.5,<4.6

  - libxml2

  - make

  - mesalib

  - mysql

  - mysql-connector-c

  - nanoflann <1.4

  - nlohmann_json

  - ninja>=1.7.2, <2

  - nlohmann_json=3.11.2

  - ninja >=1.7.2,<1.8

  - nn

  - opencv>=4.5.2, <5

  - openssl>=3.1.2,<4.0a0

  - pcl >=1.10, <2

  - opencv >=4.7,<4.8

  - openssl >=3.1.2,<3.2

  - pcl >=1.13,<1.14

  - plio

  - protobuf

  - python=3.12

  - python_abi=3.12

  - python >=3.10

  - python_abi >=3.10

  - pytest

  - rclone

  - qhull

  - qt-main

  - qt-main>=5.15.8, <5.16

  - qwt <6.3.0

  - rclone

  - sqlite>=3.43.0,<4.0a0

  - sqlite >=3.46.0,<3.47

  - suitesparse <7.7.0

  - superlu

  - swig

  - texlive-core

  - tnt

  - usgscsm

  - x264

  - xalan-c

  - xerces-c >=3.2.4,<3.3.0a0
@@ -73,4 +74,4 @@ dependencies: 
  - xorg-libsm

  - xorg-libx11

  - xorg-libxi

  - zlib>=1.2.13,<1.3.0a0
 
  - zlib >=1.3,<1.4.0a0

isis/CMakeLists.txt

+6 −5
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ message("Detected Operating System: ${osVersionString}") 
#===============================================================================

# Configuration options



# All libraries are build as shared.  The main library is also built

#  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)
@@ -279,7 +275,7 @@ find_package(Jama 125 REQUIRED) 
find_package(NN                REQUIRED)

find_package(OpenCV    3.1.0   REQUIRED)

find_package(PCL               REQUIRED)

find_package(protobuf          REQUIRED CONFIG)

find_package(Protobuf          REQUIRED)

find_package(Qwt       6       REQUIRED)

find_package(SuperLU   4.3     REQUIRED)

find_package(TIFF      4.0.0   REQUIRED)
@@ -302,6 +298,11 @@ else() 
  set(SENSOR_UTILITIES_BUILD_TESTS OFF CACHE BOOL "Disable SensorUtilities Tests")

endif()





# All libraries are build as shared.  The main library is also built

#  as a static library using some specialized code in Utilities.cmake.

set(BUILD_SHARED_LIBS ON)



add_subdirectory(../SensorUtilities SensorUtilities)



# In this case, we specify the version numbers being searched for in the non-traditional installs.

recipe/meta.yaml

+23 −23
Original line number Diff line number Diff line
@@ -48,39 +48,38 @@ requirements: 
   - ale =0.10.0,<1

   - aom

   - armadillo

   - boost >=1.72.0,<2

   - boost-cpp >=1.72.0,<2

   - boost >=1.78.0,<1.79

   - boost-cpp >=1.78.0,<1.79

   - blas

   - usgs-astrogeology::bullet

   - bz2file

   - bzip2

   - cmake >=3.15,<4

   - cmake >=3.27,<3.28

   - cspice =67

   - csm >=3.0.3,<3.0.4

   - curl >=8.3.0,<9.0a0

   - cxx-compiler >=1.1.2

   - curl >=8.4.0,<8.5

   - cxx-compiler=1.1.2

   - doxygen

   - eigen >=3, <4

   - embree >=3, <4

   - ffmpeg

   - geos >=3.12.1, <4

   - geos >=3.12, <3.13

   - geotiff

   - gmp

   - graphviz

   - gsl >=2.6

   - hdf5 >=1.14.2,<1.14.3.0a0

   - conda-forge::gsl >=2.6, <2.7

   - hdf5

   - icu

   - inja

   - jama

   - usgs-astrogeology::kakadu==1

   - kalasiris

   - krb5

   - libboost >=1.72.0,<2

   - libgdal >=3.7.2,<3.8.0a0

   - libopencv >=4.5.2,<5

   - libpng >=1.6.34,<2

   - libgdal >=3.7.0,<3.8

   - libopencv >=4.7,<4.8

   - libpng >=1.6.34,<1.7

   - libprotobuf

   - libtiff >=4.0,<5

   - libtiff >=4.5,<4.6

   - libxml2

   - make

   - mesalib
@@ -88,21 +87,21 @@ requirements: 
   - mysql-connector-c

   - nanoflann <1.4

   - nlohmann_json

   - ninja >=1.7.2,<2

   - ninja >=1.7.2,<1.8

   - nn

   - opencv >=4.5.2,<5

   - openssl >=3.1.2,<4.0a0

   - pcl >=1.10,<2

   - opencv >=4.7,<4.8

   - openssl >=3.1.2,<3.2

   - pcl >=1.13,<1.14

   - plio

   - protobuf

   - python =3.12

   - python_abi =3.12

   - python >=3.10

   - python_abi >=3.10

   - pytest

   - rclone

   - qhull

   - qt-main

   - qt-main=5.15.8

   - qwt <6.3.0

   - sqlite >=3.43.0,<4.0a0

   - sqlite >=3.46.0,<3.47

   - suitesparse <7.7.0

   - superlu

   - swig
@@ -116,7 +115,7 @@ requirements: 
   - xorg-libsm

   - xorg-libx11

   - xorg-libxi

   - zlib >=1.2.13,<1.3.0a0

   - zlib >=1.3,<1.4



  run:

  - {{ pin_compatible('ale', max_pin='x.x.x') }}
@@ -161,9 +160,10 @@ requirements: 
  - {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }}

  - {{ pin_compatible('protobuf', max_pin='x.x') }}

  - qhull

  - {{ pin_compatible('qt', max_pin='x.x') }}

  - {{ pin_compatible('qt-main', max_pin='x.x') }}

  - {{ pin_compatible('qwt', max_pin='x.x') }}

  - rclone

  - {{ pin_compatible('suitesparse', min_pin='x.x', max_pin='x.x') }}

  - superlu

  - tnt

  - x264