Commit 080a2e09 authored by David Thompson's avatar David Thompson Committed by Kitware Robot
Browse files

Merge topic 'moab-use-imported-targets'

8efdeb70 itk: update to support a newer HDF5
476d16ae itk: use superbuild-provided libraries where possible
c09f1706 hdf5: use the superbuild's version
b24b670c paraview: update the hash
1d1c0bbf moab: use imported targets for CURL and HDF5
61599a24 libarchive: disable compiling test code
81be7068 ci: bump the minimum version for fetch_submodule.cmake
5bc002d1

 gitlab-ci: fetch submodules inside the script
...
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: David Thompson's avatarDavid Thompson <david.thompson@kitware.com>
Merge-request: !725
parents 00dd82d5 8efdeb70
Pipeline #215073 failed with stages
in 341 minutes and 34 seconds
......@@ -124,7 +124,7 @@ build:centos7-newparaview:
- .cmake_build_linux
- .cmake_build_artifacts
- .linux_builder_tags
- .run_manually
- .merged_only
allow_failure: true
test:centos7-newparaview:
......@@ -133,7 +133,7 @@ test:centos7-newparaview:
- .cmake_test_linux
- .cmake_package_artifacts
- .linux_test_tags
- .run_automatically
- .merged_only
allow_failure: true
dependencies:
- build:centos7-newparaview
......
......@@ -34,8 +34,6 @@ endif ()
if ("$ENV{CI_JOB_NAME}" MATCHES "windows")
list(APPEND test_exclusions
# Needs vtk/vtk!7594
"openSMTKFileInParaViewPy"
# Zoomed in somehow?
"displayAuxiliaryGeometry"
# Rendering changes.
......
cmake_minimum_required(VERSION 2.8.8)
cmake_minimum_required(VERSION 3.12)
# Find Git.
find_program(GIT_COMMAND NAMES git git.cmd)
execute_process(
COMMAND "${GIT_COMMAND}" submodule update --init --recursive
OUTPUT_VARIABLE init_submodules
RESULT_VARIABLE res
ERROR_VARIABLE err
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Ignore the error; we just want to make sure the submodules are present.
# Check if we're in a merge request (nothing should be needed if not).
if ("$ENV{CI_MERGE_REQUEST_ID}" STREQUAL "")
return ()
endif ()
# Find Git.
find_program(GIT_COMMAND NAMES git git.cmd)
if (NOT GIT_COMMAND)
message(FATAL_ERROR
"`git` was not found.")
......
......@@ -68,7 +68,6 @@
- export PATH=$PWD/.gitlab:$PWD/.gitlab/cmake/bin:$PATH
- cmake --version
- ninja --version
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
......@@ -64,7 +64,6 @@
# Download Qt
- cmake -P .gitlab/ci/download_qt.cmake
- export CMAKE_PREFIX_PATH=$PWD/.gitlab/qt
- "git submodule update --init --recursive || :"
- git submodule foreach --recursive cmake -P "$PWD/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
......@@ -77,7 +77,6 @@
- Set-Item -Force -Path "env:PATH" -Value "$env:PATH;$pwdpath\build\install\bin;$pwdpath\build\install\Python"
- Set-Item -Force -Path "env:PYTHONHOME" -Value "$pwdpath\build\install\Python"
# Support submodule references to the user's fork.
- git submodule update --init --recursive
- git submodule foreach --recursive cmake -P "$pwdpath/.gitlab/ci/fetch_submodule.cmake"
- git submodule sync --recursive
- git submodule update --init --recursive
......
# The common superbuild's hdf5 configuration does not set CMAKE_INSTALL_RPATH,
# so we override it with our own hdf5 configuration.
superbuild_add_project(hdf5
CAN_USE_SYSTEM
DEPENDS zlib szip
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_RPATH:PATH=$ORIGIN/../lib
-DHDF5_BUILD_EXAMPLES:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=TRUE
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=TRUE
-DHDF5_ENABLE_SZIP_ENCODING:BOOL=TRUE
-DHDF5_BUILD_HL_LIB:BOOL=TRUE
-DHDF5_BUILD_WITH_INSTALL_NAME:BOOL=ON)
superbuild_add_extra_cmake_args(
-DHDF5_ROOT:PATH=<INSTALL_DIR>
-DHDF5_NO_FIND_PACKAGE_CONFIG_FILE:BOOL=ON)
superbuild_apply_patch(hdf5 fix-ext-pkg-find
"Force proper logic for zlib and szip dependencies")
find_package(HDF5 REQUIRED)
superbuild_add_extra_cmake_args(
-DHDF5_C_LIBRARY:FILEPATH=${HDF5_C_LIBRARY}
-DHDF5_HL_LIBRARY:FILEPATH=${HDF5_HL_LIBRARY}
-DHDF5_LIBRARY:FILEPATH=${HDF5_LIBRARY}
-DHDF5_INCLUDE_DIRS:PATH=${HDF5_INCLUDE_DIRS})
......@@ -7,6 +7,7 @@ endif()
superbuild_add_project(itk
DEPENDS cxx11
DEPENDS_OPTIONAL hdf5 vxl png zlib eigen
${environment}
CMAKE_ARGS
# Build what you need
......@@ -17,6 +18,12 @@ superbuild_add_project(itk
-DITK_BUILD_DOCUMENTATION:BOOL=OFF
-DITK_WRAP_PYTHON:BOOL=OFF
-DITK_SKIP_PATH_LENGTH_CHECKS:BOOL=ON
# Using ITK doesn't work quite right.
#-DITK_USE_SYSTEM_EIGEN:BOOL=${eigen_enabled}
-DITK_USE_SYSTEM_HDF5:BOOL=${hdf5_enabled}
-DITK_USE_SYSTEM_PNG:BOOL=${png_enabled}
-DITK_USE_SYSTEM_VXL:BOOL=${vxl_enabled}
-DITK_USE_SYSTEM_ZLIB:BOOL=${zlib_enabled}
-DCMAKE_INSTALL_LIBDIR:STRING=lib
)
......
......@@ -9,6 +9,7 @@ superbuild_add_project(libarchive
DEPENDS bzip2 zlib ${libarchive_xml_dep}
CMAKE_ARGS
-DBUILD_TESTING:BOOL=OFF
-DBUILD_TEST:BOOL=OFF
-DENABLE_LIBXML2:BOOL=${libarchive_use_libxml2}
-DENABLE_EXPAT:BOOL=OFF
# quiet "developer-only" warnings
......
......@@ -32,6 +32,9 @@ superbuild_apply_patch(moab find-hdf5-default-path
superbuild_apply_patch(moab add-alternate-name-for-triangle
"Add ExodusII standard label TRIANGLE for triangle elements")
superbuild_apply_patch(moab ext-deps
"Re-find external dependencies when finding MOAB")
# By default, linux and os x cmake looks in <INSTALL_DIR>/lib/cmake for
# things. On windows, it does not. So, we set MOAB_DIR to point to the
# location of MOABConfig.cmake for everyone.
......
......@@ -36,6 +36,13 @@ else ()
set(paraview_matplotlib_selection NO)
endif ()
set(paraview_dll_paths)
if (qt5_dllpath)
list(APPEND paraview_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" paraview_dll_paths "${paraview_dll_paths}")
superbuild_add_project(paraview
DEBUGGABLE
DEPENDS
......@@ -69,6 +76,9 @@ superbuild_add_project(paraview
# enable VisIt bridge for additional file readers
-DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
-DPARAVIEW_UNIFIED_INSTALL_TREE:BOOL=ON
-DVTK_DLL_PATHS:STRING=${paraview_dll_paths}
#CMB needs geovis enabled to provide the gdal reader
-DVTK_MODULE_ENABLE_VTK_GeovisCore:STRING=YES
-DVTK_MODULE_ENABLE_VTK_ViewsInfovis:STRING=YES
......
diff -u -U5 -r hdf5-1.10.3/CMakeFilters.cmake hdf5-1.10.3.fix-ext-pkg-find/CMakeFilters.cmake
--- hdf5-1.10.3/CMakeFilters.cmake 2018-08-09 17:36:31.000000000 -0400
+++ hdf5-1.10.3.fix-ext-pkg-find/CMakeFilters.cmake 2019-03-15 11:53:03.238932850 -0400
@@ -39,13 +39,13 @@
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_Z_LIB_SUPPORT "Enable Zlib Filters" OFF)
if (HDF5_ENABLE_Z_LIB_SUPPORT)
if (NOT H5_ZLIB_HEADER)
if (NOT ZLIB_USE_EXTERNAL)
- find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+ #find_package (ZLIB NAMES ${ZLIB_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
if (NOT ZLIB_FOUND)
- find_package (ZLIB) # Legacy find
+ find_package (ZLIB MODULE) # Legacy find
if (ZLIB_FOUND)
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES})
endif ()
endif ()
@@ -90,16 +90,21 @@
#-----------------------------------------------------------------------------
option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
if (HDF5_ENABLE_SZIP_SUPPORT)
option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
if (NOT SZIP_USE_EXTERNAL)
- find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+ #find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
if (NOT SZIP_FOUND)
- find_package (SZIP) # Legacy find
+ if (WIN32)
+ find_package (SZIP CONFIG) # Legacy find
+ else ()
+ find_package (SZIP) # Legacy find
+ endif ()
if (SZIP_FOUND)
set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES})
+ set (SZIP_INCLUDE_DIR ${SZIP_INCLUDE_DIRS})
endif ()
endif ()
endif ()
if (SZIP_FOUND)
set (H5_HAVE_FILTER_SZIP 1)
diff -u -Nru5 moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/CMakeLists.txt moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/CMakeLists.txt
--- moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/CMakeLists.txt 2017-11-29 11:03:38.000000000 -0500
+++ moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/CMakeLists.txt 2021-01-28 14:10:34.126074468 -0500
@@ -89,10 +89,11 @@
include ( CheckTypeSize )
# Compiler defines... this should really be in a config file.
set( MOAB_DEFINES "" )
set( MOAB_LIBS )
+set( MOAB_LIBS_CMAKE )
set( MOAB_INSTALL_TARGETS )
################################################################################
# Options that the user controls
################################################################################
@@ -267,12 +268,18 @@
if ( MOAB_HAVE_MPI )
set (MOAB_HAVE_HDF5_PARALLEL ON)
endif ( )
if ( CURL_FOUND )
set( HDF5_LIBRARIES ${HDF5_LIBRARIES} ${CURL_LIBRARIES} )
+ list(APPEND MOAB_LIBS_CMAKE CURL::libcurl)
endif ( CURL_FOUND )
set( MOAB_LIBS ${HDF5_LIBRARIES} ${MOAB_LIBS} )
+ if (TARGET HDF5::HDF5)
+ list(APPEND MOAB_LIBS_CMAKE HDF5::HDF5 )
+ else ()
+ list(APPEND MOAB_LIBS_CMAKE ${HDF5_LIBRARIES} )
+ endif ()
include_directories( ${HDF5_INCLUDE_DIR} src/io/mhdf/include )
endif ( ENABLE_HDF5 )
set (MOAB_HAVE_NETCDF OFF CACHE INTERNAL "Found necessary NetCDF components. Configure MOAB with it." )
set (MOAB_HAVE_PNETCDF OFF CACHE INTERNAL "Found necessary PNetCDF components. Configure MOAB with it." )
@@ -281,16 +288,18 @@
# set( MOAB_DEFINES "-DNETCDF_FILE ${MOAB_DEFINES}" )
set (MOAB_HAVE_NETCDF ON)
set (MOAB_HAVE_NETCDF_H 1)
include_directories( ${NETCDF_INCLUDES} )
set( MOAB_LIBS ${NETCDF_LIBRARIES} ${MOAB_LIBS} )
+ list(APPEND MOAB_LIBS_CMAKE ${NETCDF_LIBRARIES}) # FIXME: use imported target(s)
#
if ( PNETCDF_FOUND )
# find_package( PNetCDF REQUIRED )
set (MOAB_HAVE_PNETCDF ON)
include_directories( ${PNETCDF_INCLUDES} )
set( MOAB_LIBS ${PNETCDF_LIBRARIES} ${MOAB_LIBS} )
+ list(APPEND MOAB_LIBS_CMAKE ${PNETCDF_LIBRARIES}) # FIXME: use imported target(s)
endif ( PNETCDF_FOUND )
endif ( ENABLE_NETCDF )
set (MOAB_HAVE_METIS OFF CACHE INTERNAL "Found necessary Metis components. Configure MOAB with it." )
if ( ENABLE_METIS )
diff -u -Nru5 moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/config/MOABConfig.cmake.cmake moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/config/MOABConfig.cmake.cmake
--- moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/config/MOABConfig.cmake.cmake 2017-11-29 11:03:38.000000000 -0500
+++ moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/config/MOABConfig.cmake.cmake 2021-02-09 17:10:23.186246293 -0500
@@ -51,10 +51,34 @@
set(CGM_DIR "@CGM_DIR@")
set(ENABLE_IMESH @ENABLE_IMESH@)
set(ENABLE_IREL @ENABLE_IREL@)
set(ENABLE_FBIGEOM @ENABLE_FBIGEOM@)
+if (@ENABLE_HDF5@) # ENABLE_HDF5
+ set(_MOAB_install_dir "@CMAKE_INSTALL_LIBDIR@/cmake/MOAB")
+ set(_MOAB_install_prefix "${CMAKE_CURRENT_LIST_DIR}")
+ while (_MOAB_install_dir)
+ get_filename_component(_MOAB_install_prefix "${_MOAB_install_prefix}" DIRECTORY)
+ get_filename_component(_MOAB_install_dir "${_MOAB_install_dir}" DIRECTORY)
+ endwhile ()
+ unset(_MOAB_install_dir)
+
+ set(CMAKE_PREFIX_PATH_save_MOAB "${CMAKE_PREFIX_PATH}")
+ list(INSERT CMAKE_PREFIX_PATH 0
+ "${_MOAB_install_prefix}")
+ unset(_MOAB_install_prefix)
+
+ include(CMakeFindDependencyMacro)
+ find_dependency(HDF5)
+ if (@CURL_FOUND@) # CURL_FOUND
+ find_dependency(CURL)
+ endif ()
+
+ set(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH_save_MOAB}")
+ unset(CMAKE_PREFIX_PATH_save_MOAB)
+endif ()
+
set (MOAB_PACKAGE_LIBS "@ZOLTAN_LIBRARIES@ @PNETCDF_LIBRARIES@ @NETCDF_LIBRARIES@ @HDF5_LIBRARIES@ @PARMETIS_LIBRARIES@ @METIS_LIBRARIES@ @CGM_LIBRARIES@ @LAPACK_LIBRARIES@ @BLAS_LIBRARIES@ @MPI_CXX_LIBRARIES@" )
string(STRIP "${MOAB_PACKAGE_LIBS}" MOAB_PACKAGE_LIBS)
set(MOAB_PACKAGE_LIBS_LIST ${MOAB_PACKAGE_LIBS})
separate_arguments(MOAB_PACKAGE_LIBS_LIST)
list(REMOVE_DUPLICATES MOAB_PACKAGE_LIBS_LIST)
@@ -69,17 +93,10 @@
if(NOT TARGET MOAB AND NOT MOAB_BINARY_DIR)
include("${MOAB_CMAKE_DIR}/MOABTargets.cmake")
endif()
-# Target information
-if(MOAB_USE_HDF5)
- if(EXISTS "@HDF5_ROOT@/share/cmake/hdf5/hdf5-config.cmake")
- include(@HDF5_ROOT@/share/cmake/hdf5/hdf5-config.cmake)
- endif()
-endif()
-
set(MOAB_LIBRARY_DIRS, "@CMAKE_INSTALL_PREFIX@/lib")
set(MOAB_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include")
set(MOAB_LIBS "-lMOAB")
set(MOAB_LIBRARIES "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ${MOAB_LIBS} ${MOAB_PACKAGE_LIBS}")
if(ENABLE_IMESH)
diff -u -Nru5 moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/src/CMakeLists.txt moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/src/CMakeLists.txt
--- moab-6425a480ffe8e08b96453618fc5530e08e68ae8a/src/CMakeLists.txt 2017-11-29 11:03:38.000000000 -0500
+++ moab-6425a480ffe8e08b96453618fc5530e08e68ae8a.ext-deps/src/CMakeLists.txt 2021-01-28 13:59:47.907762658 -0500
@@ -279,11 +279,11 @@
SOVERSION ${MOAB_VERSION_MAJOR}
)
target_link_libraries(
MOAB
- ${CMAKE_EXE_LINKER_FLAGS} ${MOAB_DEP_LIBRARIES} ${MOAB_LIBS} ${MOAB_CGM_LIBS} ${MPI_LIBRARIES} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
+ ${CMAKE_EXE_LINKER_FLAGS} ${MOAB_DEP_LIBRARIES} ${MOAB_LIBS_CMAKE} ${MOAB_CGM_LIBS} ${MPI_LIBRARIES} ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES}
)
install(
TARGETS MOAB
EXPORT MOABTargets
......@@ -39,6 +39,13 @@ else ()
set(smtk_step_keyword INDEPENDENT_STEP_TARGETS)
endif ()
set(smtk_dll_paths)
if (qt5_dllpath)
list(APPEND smtk_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" smtk_dll_paths "${smtk_dll_paths}")
#explicitly depend on gdal so we inherit the location of the GDAL library
#which FindGDAL.cmake fails to find, even when given GDAL_DIR.
superbuild_add_project(smtk
......@@ -57,6 +64,8 @@ superbuild_add_project(smtk
-D_smtk_superbuild_prefix:PATH=<INSTALL_DIR>
# Not needed for the install tree.
-DSMTK_UNIFIED_INSTALL_TREE:BOOL=ON
# Additional DLL paths required for SMTK.
-DSMTK_DLL_PATHS:STRING=${smtk_dll_paths}
${smtk_extra_cmake_args}
-DBUILD_SHARED_LIBS:BOOL=ON
......
......@@ -20,6 +20,13 @@ if (python_enabled)
set(vtkonly_python_req YES)
endif ()
set(vtk_dll_paths)
if (qt5_dllpath)
list(APPEND vtk_dll_paths
"${qt5_dllpath}")
endif ()
string(REPLACE ";" "${_superbuild_list_separator}" vtk_dll_paths "${vtk_dll_paths}")
superbuild_add_project(vtkonly
DEBUGGABLE
DEPENDS
......@@ -37,6 +44,9 @@ superbuild_add_project(vtkonly
-DVTK_PYTHON_VERSION:STRING=${python_version}
-DVTK_ENABLE_KITS:BOOL=ON
-DVTK_UNIFIED_INSTALL_TREE:BOOL=ON
-DVTK_DLL_PATHS:STRING=${vtk_dll_paths}
-DVTK_MODULE_ENABLE_VTK_GUISupportQt:STRING=${vtkonly_qt_req}
# CMB needs geovis enabled to provide the gdal reader
-DVTK_MODULE_ENABLE_VTK_CommonArchive:STRING=${vtkonly_libarchive_req}
......
include("${CMAKE_CURRENT_LIST_DIR}/../hdf5.cmake")
# On Windows, find_package(HDF5) with cmake 2.8.[8,9] always ends up finding
# the dlls instead of the libs. So setting the variables explicitly for
# dependent projects.
superbuild_add_extra_cmake_args(
-DHDF5_C_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/hdf5.lib
-DHDF5_HL_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/hdf5_hl.lib
# This variable is for CGNS, since CGNS doesn't use standard find_package()
# to find hdf5.
-DHDF5_LIBRARY:FILEPATH=<INSTALL_DIR>/lib/hdf5.lib
# These variables are for netcdf
-DHDF5_LIB:FILEPATH=<INSTALL_DIR>/lib/hdf5.lib
-DHDF5_HL_LIB:FILEPATH=<INSTALL_DIR>/lib/hdf5_hl.lib
-DHDF5_INCLUDE_DIR:FILEPATH=<INSTALL_DIR>/include)
if (NOT superbuild_is_64bit)
# On 32-bit Windows, H5public.h ends up redefining ssize_t. This patch ensures
# that the old definition is undef-ed before redefining it.
superbuild_apply_patch(hdf5 fix-ssize_t-redefine
"Fix ssize_t redefinition on 32-bit Windows")
endif ()
if (MSVC)
# hdf5 has a bug with MSVC compiler where it doesn't realize its using MSVC
# compiler when using nmake or ninja generators. This patch fixes that.
superbuild_apply_patch(hdf5 msvc-non-vs-generator
"Fix MSVC detection with Makefiles and Ninja generators")
# VS2015 support
superbuild_apply_patch(hdf5 vs2015-support
"Support Visual Studio 2015")
endif ()
diff -u -Nru5 hdf5-1.10.3/config/cmake_ext_mod/ConfigureChecks.cmake hdf5-1.10.3.msvc-non-vs-generator/config/cmake_ext_mod/ConfigureChecks.cmake
--- hdf5-1.10.3/config/cmake_ext_mod/ConfigureChecks.cmake 2018-08-09 17:36:31.000000000 -0400
+++ hdf5-1.10.3.msvc-non-vs-generator/config/cmake_ext_mod/ConfigureChecks.cmake 2019-03-14 10:08:32.051965687 -0400
@@ -62,15 +62,10 @@
# WINDOWS Hard code Values
# ----------------------------------------------------------------------
set (WINDOWS)
if (WIN32)
- if (MINGW)
- set (${HDF_PREFIX}_HAVE_MINGW 1)
- set (WINDOWS 1) # MinGW tries to imitate Windows
- set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1")
- endif ()
set (${HDF_PREFIX}_HAVE_WIN32_API 1)
set (CMAKE_REQUIRED_LIBRARIES "ws2_32.lib;wsock32.lib")
if (NOT UNIX AND NOT MINGW)
set (WINDOWS 1)
set (CMAKE_REQUIRED_FLAGS "/DWIN32_LEAN_AND_MEAN=1 /DNOGDI=1")
@@ -86,13 +81,11 @@
set (${HDF_PREFIX}_HAVE_SYS_TYPES_H 1)
set (${HDF_PREFIX}_HAVE_LIBM 1)
set (${HDF_PREFIX}_HAVE_STRDUP 1)
set (${HDF_PREFIX}_HAVE_SYSTEM 1)
set (${HDF_PREFIX}_HAVE_LONGJMP 1)
- if (NOT MINGW)
- set (${HDF_PREFIX}_HAVE_GETHOSTNAME 1)
- endif ()
+ set (${HDF_PREFIX}_HAVE_GETHOSTNAME 1)
if (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
set (${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO 1)
endif ()
set (${HDF_PREFIX}_HAVE_FUNCTION 1)
set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1)
diff -u -Nru5 hdf5-1.10.3/config/cmake_ext_mod/ConfigureChecks.cmake hdf5-1.10.3.vs2015-support/config/cmake_ext_mod/ConfigureChecks.cmake
--- hdf5-1.10.3/config/cmake_ext_mod/ConfigureChecks.cmake 2018-08-09 17:36:31.000000000 -0400
+++ hdf5-1.10.3.vs2015-support/config/cmake_ext_mod/ConfigureChecks.cmake 2019-03-14 10:09:36.891964526 -0400
@@ -94,11 +94,13 @@
if (NOT UNIX AND NOT CYGWIN AND NOT MINGW)
set (${HDF_PREFIX}_HAVE_GETCONSOLESCREENBUFFERINFO 1)
endif ()
set (${HDF_PREFIX}_HAVE_FUNCTION 1)
set (${HDF_PREFIX}_GETTIMEOFDAY_GIVES_TZ 1)
- set (${HDF_PREFIX}_HAVE_TIMEZONE 1)
+ if (NOT MSVC14)
+ set (${HDF_PREFIX}_HAVE_TIMEZONE 1)
+ endif ()
set (${HDF_PREFIX}_HAVE_GETTIMEOFDAY 1)
if (MINGW)
set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1)
endif ()
set (${HDF_PREFIX}_HAVE_LIBWS2_32 1)
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