Commit 9636d7a4 authored by Rashad Kanavath's avatar Rashad Kanavath

SuperBuild: proj4: update patch

parent 6de926d1
......@@ -41,6 +41,8 @@ ExternalProject_Add(PROJ
LOG_INSTALL 1
)
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)
......
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)
elseif(BUILD_FRAMEWORKS_AND_BUNDLE)
set_target_properties(${PROJ_CORE_TARGET}
diff -burN proj-4.8.0.orig/configure proj-4.8.0/configure
--- proj-4.8.0.orig/configure 2016-04-18 17:31:49.000000000 +0200
+++ proj-4.8.0/configure 2016-04-18 17:32:47.000000000 +0200
@@ -9044,9 +9044,9 @@
esac
if test "$_lt_dar_can_shared" = "yes"; then
output_verbose_link_cmd=func_echo_all
- archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \@rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \@rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
else
@@ -16296,4 +16296,3 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
-
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