Commit f64491d1 authored by Rashad Kanavath's avatar Rashad Kanavath

SuperBuild: update patch for proj. (patch is ready for upstream)

parent 9636d7a4
......@@ -31,7 +31,9 @@ ExternalProject_Add(PROJ
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS
${SB_CMAKE_CACHE_ARGS}
-DBUILD_LIBPROJ_SHARED:BOOL=ON
-DBUILD_LIBPROJ_SHARED:BOOL=TRUE
-DVERSIONED_OUTPUT:BOOL=FALSE
-DBUILD_FRAMEWORKS_AND_BUNDLE:BOOL=FALSE
-DPROJ_LIB_SUBDIR:STRING=lib
-DPROJ_INCLUDE_SUBDIR:STRING=include
CMAKE_COMMAND ${SB_CMAKE_COMMAND}
......@@ -45,7 +47,7 @@ SUPERBUILD_PATCH_SOURCE(PROJ)
set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
if(WIN32)
set(_SB_PROJ_LIBRARY ${SB_INSTALL_PREFIX}/lib/proj_4_9.lib)
set(_SB_PROJ_LIBRARY ${SB_INSTALL_PREFIX}/lib/proj.lib)
elseif(UNIX)
set(_SB_PROJ_LIBRARY ${SB_INSTALL_PREFIX}/lib/libproj${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
......@@ -45,7 +45,7 @@ SQLITE_HAS_COLUMN_METADATA=yes
# PROJ.4 stuff
PROJ_INCLUDE = -I@SB_INSTALL_PREFIX_NATIVE@\include
PROJ_LIBRARY = @SB_INSTALL_PREFIX_NATIVE@\lib\proj_4_9.lib
PROJ_LIBRARY = @SB_INSTALL_PREFIX_NATIVE@\lib\proj.lib
# Uncomment to use libcurl (DLL by default)
# The cURL library is used for WCS, WMS, GeoJSON, SRS call importFromUrl(), WFS, GFT, CouchDB, /vsicurl/ etc.
......
diff -burN proj-4.9.3.orig/CMakeLists.txt proj-4.9.3/CMakeLists.txt
--- proj-4.9.3.orig/CMakeLists.txt Wed Jul 26 11:13:47 2017
+++ proj-4.9.3/CMakeLists.txt Wed Jul 26 11:30:13 2017
@@ -35,6 +35,8 @@
set(PROJ_API_VERSION "12")
set(PROJ_BUILD_VERSION "12.0.0")
+option(VERSIONED_OUTPUT "suffix version into output name of binaries." ON)
+
#################################################################################
# Build features and variants
#################################################################################
diff -burN proj-4.9.3.orig/src/lib_proj.cmake proj-4.9.3/src/lib_proj.cmake
--- proj-4.9.3.orig/src/lib_proj.cmake Wed Jul 26 11:13:47 2017
+++ proj-4.9.3/src/lib_proj.cmake Wed Jul 26 11:17:38 2017
@@ -277,7 +277,7 @@
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
- OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
+# OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
CLEAN_DIRECT_OUTPUT 1)
+++ proj-4.9.3/src/lib_proj.cmake Wed Jul 26 11:31:11 2017
@@ -274,11 +274,18 @@
if(WIN32)
+ if(VERSIONED_OUTPUT)
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
CLEAN_DIRECT_OUTPUT 1)
+ else()
+ set_target_properties(${PROJ_CORE_TARGET}
+ PROPERTIES
+ VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif() #VERSIONED_OUTPUT
elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
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