diff --git a/CMakeLists.txt b/CMakeLists.txt index cdd9be81eb77476e1fbe6e7bc5938cdcc76fa942..f95af76800fa6838a64f9ae8c833211759c70ac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,14 @@ PROJECT(iriutils) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) -SET(CMAKE_INSTALL_PREFIX /usr/local) + +IF ("${INSTALL_DIR}" STREQUAL "") + MESSAGE ("[INSTALL] set install_dir to /usr/local") + SET(CMAKE_INSTALL_PREFIX /usr/local) +ELSE () + MESSAGE ("[INSTALL] set install_dir to input ${INSTALL_DIR}") + SET(CMAKE_INSTALL_PREFIX ${INSTALL_DIR}) +ENDIF () IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "DEBUG") diff --git a/Findiriutils.cmake b/Findiriutils.cmake index a435d92933cbc93a93bdb4133cd608fc6fba7b9d..3d62f89d6c41389139fdf6a288c58116f795e5af 100644 --- a/Findiriutils.cmake +++ b/Findiriutils.cmake @@ -2,7 +2,7 @@ FIND_PATH(iriutils_INCLUDE_DIR exceptions.h mutex.h mutexexceptions.h event.h ev FIND_LIBRARY(iriutils_LIBRARY NAMES iriutils - PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers) + PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers) IF (iriutils_INCLUDE_DIR AND iriutils_LIBRARY) SET(iriutils_FOUND TRUE)