diff options
| author | Lloyd Hilaiel <lloyd@hilaiel.com> | 2010-08-10 09:41:27 -0600 |
|---|---|---|
| committer | Lloyd Hilaiel <lloyd@hilaiel.com> | 2010-08-10 10:44:36 -0600 |
| commit | a31c4d0f9ad90b4b58508702fd877bb35039067e (patch) | |
| tree | c967ab351a306df11ff33cecebd3c37d6019225b | |
| parent | f4baae0b07d7abb5c3624d7189bd0377af57efc6 (diff) | |
| download | yajl-a31c4d0f9ad90b4b58508702fd877bb35039067e.tar.gz | |
fix paths embedded in dylib upon installation on osx. closes #11
more
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fa3ec4..d244280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,10 +38,6 @@ SET (YAJL_MICRO 11) SET (YAJL_DIST_NAME "yajl-${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}") -# RPATH handling -- given we statically link, we'll turn off -# unnec. rpath embedding -SET(CMAKE_SKIP_RPATH TRUE) - IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Release") ENDIF (NOT CMAKE_BUILD_TYPE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4472157..0cb84ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -60,6 +60,13 @@ SET_TARGET_PROPERTIES(yajl PROPERTIES SOVERSION ${YAJL_MAJOR} VERSION ${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO}) +#### ensure a .dylib has correct absolute installation paths upon installation +IF(APPLE) + MESSAGE("INSTALL_NAME_DIR: ${CMAKE_INSTALL_PREFIX}/lib") + SET_TARGET_PROPERTIES(yajl PROPERTIES + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") +ENDIF(APPLE) + #### build up an sdk as a post build step # create some directories |