diff options
| author | Przemysław Dolata <snowball91b@gmail.com> | 2018-01-31 09:10:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 09:10:34 +0100 |
| commit | d1208dbf313698de9ef70b3362c89cfddb51c520 (patch) | |
| tree | 55f7e53a798c74077d28982fbe9cb694b4972ffd | |
| parent | 08a95a482c3a52c440b7efd6f37d240040792cf4 (diff) | |
| parent | 7b721207235732846666143070f4990707bcb66d (diff) | |
| download | caffe-d1208dbf313698de9ef70b3362c89cfddb51c520.tar.gz caffe-d1208dbf313698de9ef70b3362c89cfddb51c520.tar.bz2 caffe-d1208dbf313698de9ef70b3362c89cfddb51c520.zip | |
Merge pull request #5865 from cheshirekow/fix/caffe_rpath
Fix cmake RPATH
| -rw-r--r-- | cmake/Misc.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/Misc.cmake b/cmake/Misc.cmake index 9dd2609b..fcb24647 100644 --- a/cmake/Misc.cmake +++ b/cmake/Misc.cmake @@ -32,9 +32,10 @@ endif() set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOLEAN "Use link paths for shared library rpath") set(CMAKE_MACOSX_RPATH TRUE) -list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${CMAKE_INSTALL_PREFIX}/lib __is_systtem_dir) +list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} __is_systtem_dir) if(${__is_systtem_dir} STREQUAL -1) - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) endif() # ---[ Funny target |