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

Superbuild: proj: update patch for windows

parent f64491d1
No related branches found
No related tags found
No related merge requests found
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:31:11 2017
@@ -274,11 +274,18 @@
+++ proj-4.9.3/src/lib_proj.cmake Wed Jul 26 12:01:10 2017
@@ -272,13 +272,19 @@
${ALL_LIBPROJ_HEADERS}
${PROJ_RESOURCES} )
-
if(WIN32)
+ if(VERSIONED_OUTPUT)
set_target_properties(${PROJ_CORE_TARGET}
......@@ -23,12 +13,12 @@ diff -burN proj-4.9.3.orig/src/lib_proj.cmake proj-4.9.3/src/lib_proj.cmake
VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
OUTPUT_NAME "${PROJ_CORE_TARGET_OUTPUT_NAME}"
CLEAN_DIRECT_OUTPUT 1)
+ else()
+ else() #VERSIONED_OUTPUT
+ set_target_properties(${PROJ_CORE_TARGET}
+ PROPERTIES
+ VERSION "${${PROJECT_INTERN_NAME}_BUILD_VERSION}"
+ CLEAN_DIRECT_OUTPUT 1)
+ endif() #VERSIONED_OUTPUT
+ endif() # VERSIONED_OUTPUT
elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
set_target_properties(${PROJ_CORE_TARGET}
PROPERTIES
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment