equal
deleted
inserted
replaced
59 #@rpath mangling |
59 #@rpath mangling |
60 set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") |
60 set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks") |
61 #install_name_tool for libraries |
61 #install_name_tool for libraries |
62 set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE) |
62 set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE) |
63 set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Frameworks") |
63 set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Frameworks") |
64 else(APPLE AND NOT (${CMAKE_INSTALL_PREFIX} MATCHES "/usr")) |
64 # should this be a separate if block like so |
|
65 #if(NOT APPLE AND NOT (${CMAKE_INSTALL_PREFIX} MATCHES "/usr")) |
|
66 # there were some conditions here that implied not setting the RPATH if installed to /usr |
|
67 # but it was not being applied due to else not actually taking parameters (HT wuzzy) |
|
68 else() |
65 #paths where to find libraries (final slash not optional): |
69 #paths where to find libraries (final slash not optional): |
66 # - the first is relative to the executable |
70 # - the first is relative to the executable |
67 # - the second is the same directory of the executable (so it runs in bin/) |
71 # - the second is the same directory of the executable (so it runs in bin/) |
68 # - the third one is the full path of the system dir |
72 # - the third one is the full path of the system dir |
69 #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html |
73 #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html |