Commit ebb01245 authored by Cédric Traizet's avatar Cédric Traizet
Browse files

Merge branch 'update_superbuild_expat' into 'develop'

Update expat version in Superbuild

See merge request !815
parents d288632c a91dff7f
Pipeline #7415 passed with stage
in 7 minutes and 19 seconds
......@@ -56,7 +56,7 @@ if %3.==. (
)
if %4.==. (
set VCVER=14.0
set VCVER=14.20
) else (
set VCVER=%4
)
......
......@@ -21,5 +21,5 @@
# Configuration options for windows-10-x64-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -21,5 +21,5 @@
# Configuration options for windows-8.1-x64-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -21,5 +21,5 @@
# Configuration options for windows-8.1-x86-vc14.0.cmake
set(site_option
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc
"CMAKE_CXX_FLAGS:STRING=/DTHROW_QCRITICAL=0 /DWIN32 /D_WINDOWS /W3 /GR /EHsc /D_ENABLE_EXTENDED_ALIGNED_STORAGE
")
......@@ -24,8 +24,8 @@ SETUP_SUPERBUILD(EXPAT)
ExternalProject_Add(EXPAT
PREFIX EXPAT
URL "http://downloads.sourceforge.net/project/expat/expat/2.1.0/expat-2.1.0.tar.gz"
URL_MD5 dd7dab7a5fea97d2a6a43f511449b7cd
URL "http://downloads.sourceforge.net/project/expat/expat/2.3.0/expat-2.3.0.tar.gz"
URL_MD5 fb89c9a3dcc1e00e0fe0d0200af692dc
BINARY_DIR ${EXPAT_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......@@ -34,6 +34,7 @@ ExternalProject_Add(EXPAT
-DBUILD_examples:BOOL=OFF
-DBUILD_tests:BOOL=OFF
-DBUILD_tools:BOOL=OFF
-DCMAKE_INSTALL_LIBDIR:STRING=lib
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
LOG_DOWNLOAD 1
LOG_CONFIGURE 1
......
......@@ -162,7 +162,7 @@ if(NOT CMAKE_BUILD_TYPE)
endif()
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /D_ENABLE_EXTENDED_ALIGNED_STORAGE")
if(MSVC_VERSION GREATER 1310)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif()
......
......@@ -34,7 +34,7 @@ GEOTIFF_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\geotiff_i.lib
EXPAT_DIR = @SB_INSTALL_PREFIX_NATIVE@
EXPAT_INCLUDE = -I$(EXPAT_DIR)\include
EXPAT_LIB = $(EXPAT_DIR)\lib\expat.lib
EXPAT_LIB = $(EXPAT_DIR)\lib\libexpat.lib
# SQLite Libraries
SQLITE_INC=-I@SB_INSTALL_PREFIX_NATIVE@\include
......@@ -109,7 +109,7 @@ NETCDF_INC_DIR = @SB_INSTALL_PREFIX_NATIVE@\include
NETCDF_HAS_NC4 = YES
NETCDF_HAS_HDF4 = YES
# Needed to define H5_BUILT_AS_DYNAMIC_LIB for windows compilation
# Needed to define H5_BUILT_AS_DYNAMIC_LIB for windows compilation
# scenarios where it is not exported on the target (non-CMake builds)
HDF5_H5_IS_DLL = YES
......
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