Commit cab221f2 authored by Rashad Kanavath's avatar Rashad Kanavath
Browse files

Merge remote-tracking branch 'origin/update_superbuild_6.2' into update_pkg

parents 31a1d94f 4bb2c30a
......@@ -54,7 +54,8 @@ foreach(dot_diff_file ${DOT_DIFF_FILES})
endif()
if(PATCHING_FAILED)
message(FATAL_ERROR "${PATCH_PROGRAM} returned non-zero exit status \n ${patch_ov} \n")
message(FATAL_ERROR
"${PATCH_PROGRAM} ${PATCH_ARGS} -p1 -i ${dot_diff_file} failed\n error: ${patch_ov} \n")
else()
message("${patch_ov}")
endif()
......
diff -burN proj-4.9.3.orig/CMakeLists.txt proj-4.9.3/CMakeLists.txt
--- proj-4.9.3.orig/CMakeLists.txt 2016-08-29 20:47:58.000000000 +0200
+++ proj-4.9.3/CMakeLists.txt 2017-07-26 12:34:26.071721900 +0200
@@ -34,6 +34,7 @@
proj_version(MAJOR 4 MINOR 9 PATCH 3)
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 12:01:10 2017
@@ -272,13 +272,19 @@
${ALL_LIBPROJ_HEADERS}
${PROJ_RESOURCES} )
--- proj-4.9.3.orig/src/lib_proj.cmake 2016-08-29 20:47:58.000000000 +0200
+++ proj-4.9.3/src/lib_proj.cmake 2017-07-26 12:28:51.098731200 +0200
@@ -274,11 +274,19 @@
-
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() #VERSIONED_OUTPUT
+ set_target_properties(${PROJ_CORE_TARGET}
+ PROPERTIES
+ VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif() # VERSIONED_OUTPUT
+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