diff options
| author | Howard Butler <howard@hobu.co> | 2015-02-22 23:06:13 +0000 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-02-22 23:06:13 +0000 |
| commit | 4f2ff5857f6f554b7e5c25c139d8064e031c7b73 (patch) | |
| tree | a94374c80c26ee16a3ce9440a6dcd9f2b5712b98 /src/CMakeLists.txt | |
| parent | 41d8647cdff0c7550b77e7d225e2578ea736d777 (diff) | |
| download | PROJ-4f2ff5857f6f554b7e5c25c139d8064e031c7b73.tar.gz PROJ-4f2ff5857f6f554b7e5c25c139d8064e031c7b73.zip | |
More CMake churn #264
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2632 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 77d5d6f5..7c84fabc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,14 +11,14 @@ option(BUILD_NAD2BIN "Build nad2bin (format conversion tool) " ON) if(NOT MSVC) if (NOT APPLE) # Use relative path so that package is relocatable - set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib") + set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${LIBDIR}") else () - set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") + set (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}") # TO DO: cmake 2.8.12 introduces a way to make the install tree # relocatable with OSX via # (1) set(CMAKE_MACOSX_RPATH ON) and # (2) setting the INSTALL_RPATH property on the executables to - # "@loader_path/../lib" + # "@loader_path/../${LIBDIR}" endif () endif () |