Skip to content
Browse files

Merge remote-tracking branch 'origin/candidate-3.8.x' into candidate-…

…3.10.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
  • Loading branch information...
2 parents f3c0fdf + 1206071 commit 5aa888b6303a1a015dca56381e2d942e6149ddae @richardkchapman richardkchapman committed
Showing with 5 additions and 0 deletions.
  1. +5 −0 lib2/CMakeLists.txt
View
5 lib2/CMakeLists.txt
@@ -62,6 +62,11 @@ foreach(dylib ${DYLIBS})
set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_48_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
endif ()
+ string(REPLACE ".110.0.dylib" ".dylib" dylib_110_path "${dylib_path}")
+ if (NOT "${dylib_110_path}" STREQUAL "${dylib_path}")
+ set(fixupCommand "${fixupCommand}\r\nexecute_process(COMMAND install_name_tool -change \"${dylib_110_path}\" \"@loader_path/../lib2/${dylib_name_ext}\" \${file})")
+ endif ()
+
install(CODE "
file(GLOB files \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${EXEC_DIR}/*\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/*.dylib\" \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/lib2/*.dylib\")
foreach(file \${files})

0 comments on commit 5aa888b

Please sign in to comment.
Something went wrong with that request. Please try again.