Index: teem-1.11.0-src/CMakeLists.txt
===================================================================
--- teem-1.11.0-src.orig/CMakeLists.txt
+++ teem-1.11.0-src/CMakeLists.txt
@@ -372,10 +372,11 @@ ADD_LIBRARY(teem ${Teem_SOURCES})
# RPATH stuff, and mac will ingore the INSTALL_RPATH. Make sure for
# macs to set BUILD_WITH_INSTALL_RPATH OFF and set INSTALL_NAME_DIR.
# I belive INSTALL_NAME_DIR will be ignored on linux.
+SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH "Lirary installation directory.")
SET_TARGET_PROPERTIES(teem PROPERTIES
BUILD_WITH_INSTALL_RPATH OFF
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
- INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib
+ INSTALL_RPATH ${LIB_INSTALL_DIR}
+ INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
SOVERSION 1
VERSION ${Teem_VERSION_STRING}
)
@@ -415,8 +416,8 @@ ENDIF(Teem_USE_LIB_INSTALL_SUBDIR)
INSTALL(TARGETS teem
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib${EXTRA_INSTALL_PATH}
- ARCHIVE DESTINATION lib${EXTRA_INSTALL_PATH}
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
# Stand-alone programs to process hex encoding of data
@@ -492,12 +493,12 @@ ELSE(Teem_USE_LIB_INSTALL_SUBDIR)
SET(Teem_CV_CONFIG_TO_ROOT "..")
ENDIF(Teem_USE_LIB_INSTALL_SUBDIR)
-SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemLibraryDepends.cmake")
+SET(Teem_CV_LIBRARY_DEPENDS_FILE "\${Teem_ROOT_DIR}/cmake${EXTRA_INSTALL_PATH}/TeemLibraryDepends.cmake")
SET(Teem_CV_EXECUTABLE_DIRS "\${Teem_ROOT_DIR}/bin")
-SET(Teem_CV_LIBRARY_DIRS "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}")
-SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemUse.cmake")
+SET(Teem_CV_LIBRARY_DIRS "\${Teem_ROOT_DIR}/cmake${EXTRA_INSTALL_PATH}")
+SET(Teem_CV_USE_FILE "\${Teem_ROOT_DIR}/cmake${EXTRA_INSTALL_PATH}/TeemUse.cmake")
SET(Teem_CV_INCLUDE_DIRS "\${Teem_ROOT_DIR}/include")
-SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/lib${EXTRA_INSTALL_PATH}/TeemBuildSettings.cmake")
+SET(Teem_CV_BUILD_SETTINGS_FILE "\${Teem_ROOT_DIR}/cmake${EXTRA_INSTALL_PATH}/TeemBuildSettings.cmake")
SET(Teem_CV_BUILT_LIBRARIES teem) # The libraries built by teem. Currently we only build the mega library.
CONFIGURE_FILE("${Teem_SOURCE_DIR}/CMake/TeemConfig.cmake.in"
@@ -513,5 +514,5 @@ INSTALL(FILES
"${Teem_SOURCE_DIR}/CMake/TeemUse.cmake"
"${Teem_BINARY_DIR}/TeemBuildSettings.cmake"
"${Teem_BINARY_DIR}/TeemLibraryDepends.cmake"
- DESTINATION lib${EXTRA_INSTALL_PATH}
+ DESTINATION ${LIB_INSTALL_DIR}/cmake${EXTRA_INSTALL_PATH}
)
Index: teem-1.11.0-src/src/bin/CMakeLists.txt
===================================================================
--- teem-1.11.0-src.orig/src/bin/CMakeLists.txt
+++ teem-1.11.0-src/src/bin/CMakeLists.txt
@@ -28,7 +28,7 @@ MACRO(CREATE_EXEC name sources)
RUNTIME DESTINATION bin
)
SET_TARGET_PROPERTIES(${name} PROPERTIES
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
+ INSTALL_RPATH ${LIB_INSTALL_DIR}
)
ENDMACRO(CREATE_EXEC)