Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Main Repositories
otb
Commits
043c291a
Commit
043c291a
authored
Apr 19, 2016
by
Rashad Kanavath
Browse files
SuperBuild: FFTW: use @rpath for install_name
parent
d3a63dc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
SuperBuild/CMake/External_fftw.cmake
View file @
043c291a
...
...
@@ -40,6 +40,10 @@ else()
DEPENDS
${
FFTW_DEPENDENCIES
}
)
if
(
APPLE
)
SUPERBUILD_PATCH_SOURCE
(
FFTWF
"patch-for-at-rpath"
${
CMAKE_SOURCE_DIR
}
/patches/FFTW
)
endif
()
# Compile the double version of FFTW
ExternalProject_Add
(
FFTWD
PREFIX FFTW/FFTWD
...
...
@@ -61,6 +65,10 @@ else()
--disable-dependency-tracking
)
if
(
APPLE
)
SUPERBUILD_PATCH_SOURCE
(
FFTWD
"patch-for-at-rpath"
${
CMAKE_SOURCE_DIR
}
/patches/FFTW
)
endif
()
ExternalProject_Add
(
FFTW
PREFIX FFTW
DOWNLOAD_COMMAND
""
...
...
SuperBuild/patches/FFTW/fftw-osx-rpath-fix.diff
0 → 100755
View file @
043c291a
--- fftw-3.3.4.orig/configure 2016-04-19 09:26:21.000000000 +0200
+++ fftw-3.3.4/configure 2016-04-19 09:27:21.000000000 +0200
@@ -10776,9 +10776,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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment