Unverified Commit fb3884d1 authored by Amy Stamile's avatar Amy Stamile Committed by GitHub
Browse files

fixes gtest 1.10 with Monterey OS (#5079) 

* fixes gtest 1.10 with Monterey OS

* Removes cxx-compiler from Jenkinsfiles
parent 57baf6ea

Jenkinsfile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ pipeline { 
                conda install -c conda-forge python=3 findutils

                mamba env update -f environment.yml --prune

                conda activate isis

                mamba install -c conda-forge cxx-compiler git

                mamba install -c conda-forge git

                git submodule update --init --recursive

                conda list

                '''

environment.yml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ dependencies: 
  - cspice

  - csm>=3.0.3,<3.0.4

  - curl

  - cxx-compiler=1.1.2

  - doxygen

  - eigen < 3.4

  - embree

isis/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ set(CMAKE_FRAMEWORK_PATH /System/Library/Frameworks/) 
set(CMAKE_FIND_FRAMEWORK LAST)



# Enable use of @rpath on Mac

set(CMAKE_MACOS_RPATH 1)

set(CMAKE_MACOSX_RPATH 1)



include(AddIsisModule)

include(Utilities)

isis/make/config.darwin-MacOSX12_6

0 → 100644
+601 −0

File added.

Preview size limit exceeded, changes collapsed.