Commit 98efe2b6 authored by Thibaut ROMAIN's avatar Thibaut ROMAIN
Browse files

BUG: On windows, go back to proj6 gdal 3.2 and sqlite 3.08

parent 2eb5559e
Pipeline #9246 failed with stages
in 4 minutes and 25 seconds
......@@ -147,10 +147,18 @@ else(MSVC)
endif()
if(WIN32)
set(GDAL_URL "https://download.osgeo.org/gdal/3.2.2/gdal-3.2.2.tar.xz"
set(GDAL_MD5 c656be582f7beb528c66486cd1fca7a2)
else()
set(GDAL_URL "https://download.osgeo.org/gdal/3.4.0/gdal-3.4.0.tar.xz")
set(GDAL_MD5 aae5f3394dcd3ad6ddbe1137121b624b)
endif()
ExternalProject_Add(GDAL
PREFIX GDAL
URL "https://download.osgeo.org/gdal/3.4.0/gdal-3.4.0.tar.xz"
URL_MD5 aae5f3394dcd3ad6ddbe1137121b624b
URL ${GDAL_URL}
URL_MD5 ${GDAL_MD5}
SOURCE_DIR ${GDAL_SB_SRC}
BINARY_DIR ${GDAL_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -22,10 +22,19 @@ INCLUDE_ONCE_MACRO(GEOS)
SETUP_SUPERBUILD(GEOS)
if(WIN32)
set(GEOS_URL "https://download.osgeo.org/geos/geos-3.6.5.tar.bz2")
set(GEOS_MD5 5ddbbe9dbaf0ac45a36856c185c56b23)
else()
set(GEOS_URL "https://download.osgeo.org/geos/geos-3.9.1.tar.bz2")
set(GEOS_MD5 efc4ce81bdbaa5e5c1caefe6c9b8553c)
endif()
ExternalProject_Add(GEOS
PREFIX GEOS
URL "https://download.osgeo.org/geos/geos-3.9.1.tar.bz2"
URL_MD5 efc4ce81bdbaa5e5c1caefe6c9b8553c
URL ${GEOS_URL}
URL_MD5 ${GEOS_MD5}
SOURCE_DIR ${GEOS_SB_SRC}
BINARY_DIR ${GEOS_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
......@@ -25,11 +25,21 @@ SETUP_SUPERBUILD(PROJ)
# declare dependencies
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(PROJ SQLITE TIFF CURL)
if(WIN32)
set(PROJ_URL "https://download.osgeo.org/proj/proj-6.2.1.tar.gz")
set(PROJ_MD5 9f874e227d221daf95f7858dc55dfa3e)
set(PROJ_FLAGS -DVERSIONED_OUTPUT:BOOL=FALSE -DPROJ_TESTS:BOOL=OFF)
else()
set(PROJ_URL "https://download.osgeo.org/proj/proj-8.1.1.tar.gz")
set(PROJ_MD5 f017fd7d35311b0d65b2cf0503844690)
set(PROJ_FLAGS -DBUILD_TESTING:BOOL=OFF)
endif()
ExternalProject_Add(PROJ
DEPENDS ${PROJ_DEPENDENCIES}
PREFIX PROJ
URL "https://download.osgeo.org/proj/proj-8.1.1.tar.gz"
URL_MD5 f017fd7d35311b0d65b2cf0503844690
URL ${PROJ_URL}
URL_MD5 ${PROJ_MD5}
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......@@ -39,9 +49,9 @@ ExternalProject_Add(PROJ
-DBUILD_FRAMEWORKS_AND_BUNDLE:BOOL=FALSE
-DPROJ_LIB_SUBDIR:STRING=lib
-DPROJ_INCLUDE_SUBDIR:STRING=include
-DBUILD_TESTING:BOOL=OFF
-DENABLE_TIFF:BOOL=ON
-DENABLE_CURL:BOOL=ON
${PROJ_FLAGS}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
......
......@@ -22,10 +22,18 @@ INCLUDE_ONCE_MACRO(SQLITE)
SETUP_SUPERBUILD(SQLITE)
if(WIN32)
set(SQLITE_URL "https://www.sqlite.org/2015/sqlite-amalgamation-3080801.zip")
set(SQLITE_MD5 b1cbcbd710bdfd762dc169f1676053b5)
else()
set(SQLITE_URL "https://www.sqlite.org/2021/sqlite-amalgamation-3360000.zip")
set(SQLITE_MD5 c5d360c74111bafae1b704721ff18fe6)
endif()
ExternalProject_Add(SQLITE
PREFIX SQLITE
URL "https://www.sqlite.org/2018/sqlite-amalgamation-3250100.zip"
URL_MD5 e250c9a06858c1018896ef56a13c1d08
URL ${SQLITE_URL}
URL_MD5 ${SQLITE_MD5}
SOURCE_DIR ${SQLITE_SB_SRC}
BINARY_DIR ${SQLITE_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
--- GEOS-orig/CMakeLists.txt 2018-04-30 12:38:44.089392211 +0200
+++ GEOS/CMakeLists.txt 2018-04-30 12:41:18.754980452 +0200
@@ -189,7 +189,13 @@
include(CheckPrototypeExists)
include(CheckSymbolExists)
-check_prototype_exists(isnan cmath HAVE_STD_ISNAN)
+CHECK_CXX_SOURCE_COMPILES("
+#include <cmath>
+int main()
+{
+ bool a = std::isnan(3.14);
+ return 0;
+}" HAVE_STD_ISNAN)
if(NOT HAVE_STD_ISNAN)
if(MSVC)
check_prototype_exists(_isnan float.h HAVE_ISNAN)
diff -burN proj-6.2.1_orig/CMakeLists.txt proj-6.2.1/CMakeLists.txt
--- proj-6.2.1_orig/CMakeLists.txt 2019-10-28 18:49:32.000000000 +0100
+++ proj-6.2.1/CMakeLists.txt 2019-11-08 10:52:28.948109756 +0100
@@ -98,6 +98,7 @@
proj_version(MAJOR 6 MINOR 2 PATCH 1)
set(PROJ_API_VERSION "17")
set(PROJ_BUILD_VERSION "17.1.2")
+option(VERSIONED_OUTPUT "suffix version into output name of binaries." ON)
################################################################################
# Build features and variants
diff -burN proj-6.2.1_orig/src/lib_proj.cmake proj-6.2.1_orig/src/lib_proj.cmake
--- proj-6.2.1_orig/src/lib_proj.cmake 2019-10-28 17:49:41.000000000 +0100
+++ proj-6.2.1_orig/src/lib_proj.cmake 2019-11-12 12:00:09.696226412 +0100
@@ -401,11 +401,18 @@
endif()
if(WIN32)
+ if(VERSIONED_OUTPUT)
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
CLEAN_DIRECT_OUTPUT 1)
+ else()
+ set_target_properties(${PROJ_CORE_TARGET}
+ PROPERTIES
+ VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif() #VERSIONED_OUTPUT
elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment