Unverified Commit 5ae9f14b authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Potential 8.1 Fix (#5538) 

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

* Extra pinning and python bump to min 3.9
parent 77227a7e

environment.yml

+13 −13
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ dependencies: 
  - kalasiris 

  - ale>=0.10.0, <1

  - armadillo

  - boost=1.72

  - boost-cpp=1.72

  - boost=1.72.0, <2

  - boost-cpp=1.72.0, <2

  - blas

  - usgs-astrogeology::bullet

  - bz2file

  - bzip2

  - cmake >=3.15

  - cmake >=3.15, <4

  - cspice=67

  - csm>=3.0.3,<3.0.4

  - curl
@@ -25,7 +25,7 @@ dependencies: 
  - geotiff

  - gmp

  - graphviz

  - gsl>=2.6

  - gsl>=2.6, <3

  - hdf5

  - icu

  - inja
@@ -33,10 +33,10 @@ dependencies: 
  - jpeg

  - usgs-astrogeology::kakadu==1

  - krb5

  - libopencv>=4.5.2

  - libpng>=1.6.34

  - libprotobuf<3.20

  - libtiff>=4.0

  - libopencv>=4.5.2, <5

  - libpng>=1.6.34, <2

  - libprotobuf<3.20, <4

  - libtiff>=4.0, <5

  - libxml2

  - make

  - mesalib
@@ -46,12 +46,12 @@ dependencies: 
  - nlohmann_json

  - ninja==1.7.2

  - nn

  - opencv>=4.5.2

  - openssl>=1.1.1k

  - pcl >= 1.10.0

  - opencv>=4.5.2, <5

  - openssl>=1.1.1k, <2

  - pcl >= 1.10.0, <2

  - plio

  - protobuf<3.20

  - python>=3.7.11

  - protobuf<3.20, <4

  - python>=3.9

  - pytest

  - rclone

  - qhull

isis/CMakeLists.txt

+5 −4
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)
@@ -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.

isis/python_bindings/CMakeLists.txt

+9 −1
Original line number Diff line number Diff line
@@ -8,8 +8,16 @@ list(APPEND CMAKE_SWIG_FLAGS "-py3;-DPY3") 


message(STATUS "SWIG flags: " ${CMAKE_SWIG_FLAGS} )



if(EXISTS $ENV{CONDA_PREFIX})

  message("Searching Anaconda environment at $ENV{CONDA_PREFIX} for Python libraries")

  set(Python_FIND_VIRTUALENV FIRST)

  set(Python_FIND_REGISTRY LAST)

  set(Python_FIND_FRAMEWORK LAST)

  set(Python_FIND_STRATEGY LOCATION)

endif()



# Setup for Python linking

find_package(Python3 REQUIRED COMPONENTS Interpreter Development)

find_package(Python3 REQUIRED COMPONENTS Development)



# Setup for wrapper library

set(ASTROSET_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/astroset")