From 5c4f930af21f7e967586b8b9841d1392050b35f4 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 1 Sep 2017 15:30:17 +0200
Subject: [PATCH] SuperBuild: clean cmake scripts
---
SuperBuild/CMake/External_hdf4.cmake | 20 +++++--------------
SuperBuild/CMake/External_hdf5.cmake | 11 ----------
SuperBuild/CMake/External_netcdf.cmake | 19 ------------------
.../patches/GDAL/nmake_gdal_extra.opt.in | 2 +-
4 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/SuperBuild/CMake/External_hdf4.cmake b/SuperBuild/CMake/External_hdf4.cmake
index 379560f105..bd403d44cc 100644
--- a/SuperBuild/CMake/External_hdf4.cmake
+++ b/SuperBuild/CMake/External_hdf4.cmake
@@ -26,10 +26,9 @@ SETUP_SUPERBUILD(HDF4)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(HDF4 ZLIB JPEG)
set(HDF4_SB_CONFIG)
-ADD_SUPERBUILD_CMAKE_VAR(HDF4 ZLIB_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(HDF4 ZLIB_LIBRARY)
-ADD_SUPERBUILD_CMAKE_VAR(HDF4 JPEG_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(HDF4 JPEG_LIBRARY)
+
+set(HDF4_SB_DF_LIB df)
+set(HDF4_SB_MF_LIB mfhdf)
ExternalProject_Add(HDF4
PREFIX HDF4
@@ -62,8 +61,8 @@ ExternalProject_Add(HDF4
-DHDF4_NO_PACKAGES:BOOL=ON
-DHDF4_PACKAGE_EXTLIBS:BOOL=OFF
-DHDF_ENABLE_LARGE_FILE:BOOL=ON
- -DHDF4_SRC_LIB_CORENAME:STRING=dfalt
- -DHDF4_MF_LIB_CORENAME:STRING=mfhdfalt
+ -DHDF4_SRC_LIB_CORENAME:STRING=${HDF4_SB_DF_LIB}
+ -DHDF4_MF_LIB_CORENAME:STRING=${HDF4_SB_MF_LIB}
${HDF4_SB_CONFIG}
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
LOG_DOWNLOAD 1
@@ -73,12 +72,3 @@ ExternalProject_Add(HDF4
)
SUPERBUILD_PATCH_SOURCE(HDF4)
-
-set(_SB_MFHDF_H_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
-if(WIN32)
- set(_SB_HDF4_DF_LIB ${SB_INSTALL_PREFIX}/lib/libdfalt.lib)
- set(_SB_HDF4_MFHDF_LIB ${SB_INSTALL_PREFIX}/lib/libmfhdfalt.lib)
-elseif(UNIX)
- set(_SB_HDF4_DF_LIB ${SB_INSTALL_PREFIX}/lib/libdfalt${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(_SB_HDF4_MFHDF_LIB ${SB_INSTALL_PREFIX}/lib/libmfhdfalt${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif()
diff --git a/SuperBuild/CMake/External_hdf5.cmake b/SuperBuild/CMake/External_hdf5.cmake
index 11a66d7af8..c4a13487e9 100644
--- a/SuperBuild/CMake/External_hdf5.cmake
+++ b/SuperBuild/CMake/External_hdf5.cmake
@@ -26,8 +26,6 @@ SETUP_SUPERBUILD(HDF5)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(HDF5 ZLIB)
set(HDF5_SB_CONFIG)
-ADD_SUPERBUILD_CMAKE_VAR(HDF5 ZLIB_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(HDF5 ZLIB_LIBRARY)
ExternalProject_Add(HDF5
PREFIX HDF5
@@ -56,12 +54,3 @@ ExternalProject_Add(HDF5
LOG_BUILD 1
LOG_INSTALL 1
)
-
-set(_SB_HDF5_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
-if(WIN32)
- set(_SB_HDF5_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5.lib)
- set(_SB_HDF5_HL_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5_hl.lib)
-elseif(UNIX)
- set(_SB_HDF5_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX})
- set(_SB_HDF5_HL_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5_hl${CMAKE_SHARED_LIBRARY_SUFFIX})
-endif()
diff --git a/SuperBuild/CMake/External_netcdf.cmake b/SuperBuild/CMake/External_netcdf.cmake
index da47d4d2f4..c358280e91 100644
--- a/SuperBuild/CMake/External_netcdf.cmake
+++ b/SuperBuild/CMake/External_netcdf.cmake
@@ -26,16 +26,6 @@ SETUP_SUPERBUILD(NETCDF)
ADDTO_DEPENDENCIES_IF_NOT_SYSTEM(NETCDF HDF5 ZLIB CURL HDF4 JPEG)
set(NETCDF_SB_CONFIG)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF HDF5_ROOT)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF ZLIB_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF ZLIB_LIBRARY)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF CURL_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF CURL_LIBRARY)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF HDF4_DF_LIB)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF HDF4_MFHDF_LIB)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF MFHDF_H_INCLUDE_DIR)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF JPEG_LIB)
-ADD_SUPERBUILD_CMAKE_VAR(NETCDF JPEGLIB_H_INCLUDE_DIR)
ExternalProject_Add(NETCDF
PREFIX NETCDF
@@ -83,12 +73,3 @@ ExternalProject_Add(NETCDF
LOG_BUILD 1
LOG_INSTALL 1
)
-
-#~ set(_SB_HDF5_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
-#~ if(WIN32)
- #~ set(_SB_HDF5_LIBRARY ${SB_INSTALL_PREFIX}/lib/hdf5_i.lib)
- #~ set(_SB_HDF5_HL_LIBRARY ${SB_INSTALL_PREFIX}/lib/hdf5_hl_i.lib)
-#~ elseif(UNIX)
- #~ set(_SB_HDF5_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX})
- #~ set(_SB_HDF5_HL_LIBRARY ${SB_INSTALL_PREFIX}/lib/libhdf5_hl${CMAKE_SHARED_LIBRARY_SUFFIX})
-#~ endif()
diff --git a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
index e6f968e35e..8627f6ffc1 100644
--- a/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
+++ b/SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in
@@ -95,7 +95,7 @@ ZLIB_LIB = @SB_INSTALL_PREFIX_NATIVE@\lib\zlib.lib
HDF4_PLUGIN = NO
HDF4_DIR = @SB_INSTALL_PREFIX_NATIVE@
#HDF4_LIB = /LIBPATH:$(HDF4_DIR)\lib Ws2_32.lib
-HDF4_LIB = $(HDF4_DIR)\lib\dfalt.lib $(HDF4_DIR)\lib\mfhdfalt.lib $(JPEG_LIB) $(ZLIB_LIB)
+HDF4_LIB = $(HDF4_DIR)\lib\@HDF4_SB_DF_LIB@.lib $(HDF4_DIR)\lib\@HDF4_SB_MF_LIB@.lib $(JPEG_LIB) $(ZLIB_LIB)
HDF4_INCLUDE = $(HDF4_DIR)\include
HDF4_HAS_MAXOPENFILES = YES
--
GitLab