Unverified Commit 968dec6e authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

Geos 3.12 Update (#5361) 

* Geos changes from updating to 3.12

* Added missing float include

* Updated tests

* Cleaned up environment.yml

* Removed pdal dep

* Set geos dep to proper version

* Embree3 update

* Final changes to embree shape/target

* Use find package shipped with embree and link against embree target
parent 72d8bedc

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ print.prt 
*/tsts/*/output/*

*/build/

build/

*build*/

install/



# Unignore the documentation build

environment.yml

+29 −27
Original line number Diff line number Diff line
@@ -3,40 +3,41 @@ channels: 
  - defaults



dependencies:

  - kalasiris 

  - ale=0.9.1

  - ale>=0.9.1, <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

  - cxx-compiler=1.1.2

  - curl>=8.3.0,<9.0a0

  - cxx-compiler>=1.1.2

  - doxygen

  - eigen < 3.4

  - embree>=2.17,<3

  - eigen>=3, <4

  - embree>=3, <4

  - ffmpeg

  - geos =3.11.1

  - geos>=3.12.1, <4

  - geotiff

  - gmp

  - graphviz

  - gsl>=2.6

  - hdf5

  - hdf5>=1.14.2,<1.14.3.0a0

  - icu

  - inja

  - jama

  - jpeg

  - usgs-astrogeology::kakadu==1

  - kalasiris

  - krb5

  - libopencv>=4.5.2

  - libpng>=1.6.34

  - libprotobuf<3.20

  - libtiff>=4.0

  - libboost>=1.72.0, <2

  - libgdal >=3.7.2,<3.8.0a0

  - libopencv>=4.5.2, <5

  - libpng>=1.6.34, <2

  - libprotobuf

  - libtiff>=4.0, <5

  - libxml2

  - make

  - mesalib
@@ -44,20 +45,21 @@ dependencies: 
  - mysql-connector-c

  - nanoflann<1.4

  - nlohmann_json

  - ninja==1.7.2

  - ninja>=1.7.2, <2

  - nn

  - opencv>=4.5.2

  - openssl>=1.1.1k

  - pcl >= 1.10.0

  - opencv>=4.5.2, <5

  - openssl>=3.1.2,<4.0a0

  - pcl >=1.10, <2

  - plio

  - protobuf<3.20

  - python>=3.7.11

  - protobuf

  - python=3.12

  - python_abi=3.12

  - pytest

  - rclone

  - qhull

  - qt>=5.9.6,<5.15.0

  - qt-main

  - qwt

  - sqlite

  - rclone

  - sqlite>=3.43.0,<4.0a0

  - suitesparse

  - superlu

  - swig
@@ -65,10 +67,10 @@ dependencies: 
  - tnt

  - x264

  - xalan-c

  - xerces-c=3

  - xerces-c>=3.2.4,<3.3.0a0

  - xorg-kbproto

  - xorg-libice

  - xorg-libsm

  - xorg-libx11

  - xorg-libxi

  - zlib
 
  - zlib>=1.2.13,<1.3.0a0

gtest @ b10fad38

Compare 703bd9ca to b10fad38
Original line number Diff line number Diff line 
Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e
 
Subproject commit b10fad38c4026a29ea6561ab15fc4818170d1c10

isis/CMakeLists.txt

+7 −7
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ endif() 
# sometimes third parties do not set their rpaths correctly

set(thirdPartyCppFlags -Wall

                       -fPIC

                       -std=c++14

                       -std=c++17

                       -DISIS_LITTLE_ENDIAN=1

                       -Wno-unused-parameter

                       -Wno-overloaded-virtual
@@ -171,7 +171,7 @@ set(thirdPartyCppFlags -Wall 
                       -DENABLEJP2K=${JP2KFLAG}

                     )



set(CMAKE_CXX_STANDARD 14)

set(CMAKE_CXX_STANDARD 17)



# Append CPP flags set in the third party lib file to the string set in this file.

string(REPLACE ";" " " FLAGS_STR "${thirdPartyCppFlags}")
@@ -270,7 +270,7 @@ find_package(Cholmod 4.4.5 REQUIRED) 
find_package(CSM       3.0.3.3 REQUIRED)

find_package(CSPICE    65      REQUIRED)

find_package(Eigen             REQUIRED)

find_package(Embree    2.15.0  REQUIRED)

find_package(Embree    3.13.0  REQUIRED)

find_package(GeoTIFF   2       REQUIRED)

SET(GSL_ROOT_DIR $ENV{CONDA_PREFIX})

find_package(GSL       2.2.1   REQUIRED)
@@ -279,7 +279,7 @@ find_package(Jama 125 REQUIRED) 
find_package(NN                REQUIRED)

find_package(OpenCV    3.1.0   REQUIRED)

find_package(PCL               REQUIRED)

find_package(Protobuf  2.6.1   REQUIRED)

find_package(protobuf          REQUIRED CONFIG)

find_package(Qwt       6       REQUIRED)

find_package(SuperLU   4.3     REQUIRED)

find_package(TIFF      4.0.0   REQUIRED)
@@ -352,7 +352,7 @@ foreach (_variableName ${_variableNames}) 
endforeach()



# add target based linkages to ALLLIBS variable

list(APPEND ALLLIBS pantor::inja sensorutilities)

list(APPEND ALLLIBS pantor::inja sensorutilities protobuf::libprotobuf embree)



# Sometimes we add the same lib more than once (especially with LIBDIRS)

list(REMOVE_DUPLICATES ALLLIBDIRS)

isis/cmake/FindEmbree.cmake

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
# CMake module for find_package(Embree)

# Finds include directory and all applicable libraries

#

# Sets the following:

#   EMBREE_INCLUDE_DIR

#   EMBREE_LIBRARY



find_path(EMBREE_INCLUDE_DIR

  NAME rtcore.h

  PATH_SUFFIXES embree2

)



find_library(EMBREE_LIBRARY

  NAMES embree

)



get_filename_component(EMBREE_ROOT_INCLUDE_DIR "${EMBREE_INCLUDE_DIR}" DIRECTORY)



message(STATUS "EMBREE INCLUDE: " ${EMBREE_INCLUDE_DIR})

message(STATUS "EMBREE LIB: " ${EMBREE_LIBRARY})