From 8cddf765207412a564924db56ef8816fbacbaf43 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Fri, 2 Jul 2021 13:03:36 +0200 Subject: [PATCH 1/2] libgeotiff: build shared library --- externals/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index cc25de8417..a6e8e6bf9b 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -88,6 +88,7 @@ LCGPackage_Add( CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + -DBUILD_SHARED_LIBS=ON -DWITH_TIFF=ON -DTIFF_DIR=${tiff_home} -DPROJ_DIR=${proj_home} @@ -97,7 +98,7 @@ LCGPackage_Add( ENDIF BUILD_IN_SOURCE 1 DEPENDS proj tiff - REVISION 1 + REVISION 2 ) #---zlib-------------------------------------------------------------------------------------------- -- GitLab From 7a7ca3f568087cc28ebf76d75e25794df00619e3 Mon Sep 17 00:00:00 2001 From: Andre Sailer <andre.philippe.sailer@cern.ch> Date: Fri, 2 Jul 2021 15:59:32 +0200 Subject: [PATCH 2/2] GDAL: add patch for libtiff location on centos8, were it is in lib64 instead of lib --- externals/CMakeLists.txt | 1 + externals/patches/gdal-3.3.0.patch | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 externals/patches/gdal-3.3.0.patch diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a6e8e6bf9b..ede6034d21 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -2313,6 +2313,7 @@ LCGPackage_Add( IF <VERSION> VERSION_GREATER_EQUAL 3.3.0 THEN proj postgresql XercesC ENDIF + REVISION 1 ) #---R--------------------------------------------------------------------------- diff --git a/externals/patches/gdal-3.3.0.patch b/externals/patches/gdal-3.3.0.patch new file mode 100644 index 0000000000..e8ca007919 --- /dev/null +++ b/externals/patches/gdal-3.3.0.patch @@ -0,0 +1,5 @@ +--- configure.orig 2021-04-26 14:29:56.000000000 +0200 ++++ configure 2021-07-02 15:00:47.640438243 +0200 +@@ -24532,1 +24532,1 @@ +- LIBS="-L$with_libtiff/lib -ltiff $LIBS" ++ LIBS="-L$with_libtiff/lib -L$with_libtiff/lib64 -ltiff $LIBS" -- GitLab