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

SuperBuild: rpath fix for proj4

parent b3110d94
......@@ -14,7 +14,7 @@ else()
URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
URL_MD5 d815838c92a29179298c126effbb1537
SOURCE_DIR ${PROJ_SB_SRC}
BINARY_DIR ${PROJ_SB_BUILD_DIR}
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND ""
......@@ -27,49 +27,39 @@ else()
PREFIX PROJ/_install
DOWNLOAD_COMMAND ""
SOURCE_DIR PROJ/_install
BINARY_DIR ${PROJ_SB_BUILD_DIR}
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${SB_INSTALL_PREFIX}
-DCMAKE_BUILD_TYPE:STRING=Release
-DPROJ4_BUILD_DIR:STRING=${PROJ_SB_BUILD_DIR}/src
-DPROJ4_BUILD_DIR:STRING=${PROJ_SB_SRC}/src
DEPENDS PROJ_build
CMAKE_COMMAND
)
ExternalProject_Add_Step(PROJ_build copy_source
COMMAND ${CMAKE_COMMAND} -E copy_directory
${PROJ_SB_SRC} ${PROJ_SB_BUILD_DIR}
DEPENDEES patch update
DEPENDERS configure
)
else()
ExternalProject_Add(PROJ
PREFIX PROJ
URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
URL_MD5 d815838c92a29179298c126effbb1537
BINARY_DIR ${PROJ_SB_BUILD_DIR}
BINARY_DIR ${PROJ_SB_SRC}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
CONFIGURE_COMMAND
# use 'env' because CTest launcher doesn't perform shell interpretation
${SB_ENV_CONFIGURE_CMD}
${PROJ_SB_BUILD_DIR}/configure
${PROJ_SB_SRC}/configure
--prefix=${SB_INSTALL_PREFIX}
--enable-static=no
BUILD_COMMAND $(MAKE)
INSTALL_COMMAND $(MAKE) install
)
ExternalProject_Add_Step(PROJ copy_source
COMMAND ${CMAKE_COMMAND} -E copy_directory
${PROJ_SB_SRC} ${PROJ_SB_BUILD_DIR}
DEPENDEES patch update
DEPENDERS configure
)
FIX_RPATH_FOR_AUTOCONF_BUILD(PROJ "libproj*.dylib")
if(APPLE)
SUPERBUILD_PATCH_SOURCE(PROJ "patch-for-at-rpath")
endif()
endif()
set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
......
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