From cbaacaaa5129b60c6238d3f48103e53213a0c79e Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Wed, 19 Jul 2017 13:14:39 +0200
Subject: [PATCH] WIP: SuperBuild: proj: 4.8.0 -> 4.9.3
---
SuperBuild/CMake/External_proj.cmake | 58 ++++++++++++++--------------
1 file changed, 28 insertions(+), 30 deletions(-)
diff --git a/SuperBuild/CMake/External_proj.cmake b/SuperBuild/CMake/External_proj.cmake
index 2949915c9f..a32b572bd3 100644
--- a/SuperBuild/CMake/External_proj.cmake
+++ b/SuperBuild/CMake/External_proj.cmake
@@ -22,47 +22,45 @@ INCLUDE_ONCE_MACRO(PROJ)
SETUP_SUPERBUILD(PROJ)
-if(MSVC)
- ExternalProject_Add(PROJ
- PREFIX PROJ
- URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
- URL_MD5 d815838c92a29179298c126effbb1537
- SOURCE_DIR ${PROJ_SB_SRC}
- BINARY_DIR ${PROJ_SB_SRC}
- INSTALL_DIR ${SB_INSTALL_PREFIX}
- DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
- CONFIGURE_COMMAND ""
- BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc
- INSTALL_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc install-all INSTDIR=${SB_INSTALL_PREFIX_NATIVE}
- )
+# if(MSVC)
+# ExternalProject_Add(PROJ
+# PREFIX PROJ
+# URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
+# URL_MD5 d815838c92a29179298c126effbb1537
+# SOURCE_DIR ${PROJ_SB_SRC}
+# BINARY_DIR ${PROJ_SB_SRC}
+# INSTALL_DIR ${SB_INSTALL_PREFIX}
+# DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
+# CONFIGURE_COMMAND ""
+# BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc
+# INSTALL_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc install-all INSTDIR=${SB_INSTALL_PREFIX_NATIVE}
+# )
-else()
+# else()
- if(APPLE)
- set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD} LDFLAGS=-headerpad_max_install_names)
- else()
- set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD})
- endif()
+# if(APPLE)
+# set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD} LDFLAGS=-headerpad_max_install_names)
+# else()
+# set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD})
+# endif()
ExternalProject_Add(PROJ
PREFIX PROJ
- URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
- URL_MD5 d815838c92a29179298c126effbb1537
+ URL "http://download.osgeo.org/proj/proj-4.9.3.tar.gz"
+ URL_MD5 d598336ca834742735137c5674b214a1
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
- CONFIGURE_COMMAND
- ${SB_ENV_CONFIGURE_CMD}
- ${PROJ_SB_SRC}/configure
- --prefix=${SB_INSTALL_PREFIX}
- --enable-static=no
- BUILD_COMMAND $(MAKE)
- INSTALL_COMMAND $(MAKE) install
+ CMAKE_CACHE_ARGS
+ ${SB_CMAKE_CACHE_ARGS}
+ CMAKE_COMMAND ${SB_CMAKE_COMMAND}
)
-endif()
+
+
+# endif()
-SUPERBUILD_PATCH_SOURCE(PROJ)
+# SUPERBUILD_PATCH_SOURCE(PROJ)
set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
--
GitLab