Changeset 28205

Timestamp:

04/04/24 14:59:17 (12 months ago)

Author:

jdquinn

Message:

CHG: Non-static version does not play nicely with include and library options for PROJ

Location:

issm/trunk-jpl/externalpackages/gdal

Files:

• install-3-python.sh (modified) (2 diffs)
• install-3.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/gdal/install-3-python.sh

@@ -11 +11 @@
 VER="3.8.4"
 
-PREFIX="${ISSM_DIR}/externalpackages/gdal/install"
+PREFIX="${ISSM_EXT_SHARED_DIR}/gdal/install"
 
 ## Environment
@@ -51 +51 @@
         -DGDAL_USE_OPENSSL=OFF \
         -DGDAL_USE_PNG_INTERNAL=ON \
-        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
-        -DPROJ_LIBRARY_RELEASE="-L${PROJ_ROOT}/lib -lproj" \
+        -DPROJ_DIR="${PROJ_ROOT}" \
         -DGDAL_USE_TIFF_INTERNAL=ON \
         -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \

issm/trunk-jpl/externalpackages/gdal/install-3.sh

@@ -51 +51 @@
         -DGDAL_USE_OPENSSL=OFF \
         -DGDAL_USE_PNG_INTERNAL=ON \
-        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
-        -DPROJ_LIBRARY_RELEASE="-L${PROJ_ROOT}/lib -lproj" \
+        -DPROJ_DIR="${PROJ_ROOT}" \
         -DGDAL_USE_TIFF_INTERNAL=ON \
         -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \