Skip to content
Snippets Groups Projects
Commit cbaacaaa authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

WIP: SuperBuild: proj: 4.8.0 -> 4.9.3

parent ed784942
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SuperBuild/CMake/External_proj.cmake
+ 28
− 30
View file @ cbaacaaa
...@@ -22,47 +22,45 @@ INCLUDE_ONCE_MACRO(PROJ) ...@@ -22,47 +22,45 @@ INCLUDE_ONCE_MACRO(PROJ)
SETUP_SUPERBUILD(PROJ) SETUP_SUPERBUILD(PROJ)
if(MSVC) # if(MSVC)
ExternalProject_Add(PROJ # ExternalProject_Add(PROJ
PREFIX PROJ # PREFIX PROJ
URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz" # URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
URL_MD5 d815838c92a29179298c126effbb1537 # URL_MD5 d815838c92a29179298c126effbb1537
SOURCE_DIR ${PROJ_SB_SRC} # SOURCE_DIR ${PROJ_SB_SRC}
BINARY_DIR ${PROJ_SB_SRC} # BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX} # INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION} # DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND "" # CONFIGURE_COMMAND ""
BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc # 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} # INSTALL_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc install-all INSTDIR=${SB_INSTALL_PREFIX_NATIVE}
) # )
else() # else()
if(APPLE) # if(APPLE)
set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD} LDFLAGS=-headerpad_max_install_names) # set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD} LDFLAGS=-headerpad_max_install_names)
else() # else()
set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD}) # set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD})
endif() # endif()
ExternalProject_Add(PROJ ExternalProject_Add(PROJ
PREFIX PROJ PREFIX PROJ
URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz" URL "http://download.osgeo.org/proj/proj-4.9.3.tar.gz"
URL_MD5 d815838c92a29179298c126effbb1537 URL_MD5 d598336ca834742735137c5674b214a1
BINARY_DIR ${PROJ_SB_SRC} BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX} INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION} DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND CMAKE_CACHE_ARGS
${SB_ENV_CONFIGURE_CMD} ${SB_CMAKE_CACHE_ARGS}
${PROJ_SB_SRC}/configure CMAKE_COMMAND ${SB_CMAKE_COMMAND}
--prefix=${SB_INSTALL_PREFIX}
--enable-static=no
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
) )
endif()
# endif()
SUPERBUILD_PATCH_SOURCE(PROJ) # SUPERBUILD_PATCH_SOURCE(PROJ)
set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32) if(WIN32)
......
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