From c2f0f810445f4bd05b0759bdf96573d94a7e53d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillem=20Aleny=C3=A0=20Ribas?= <galenya@iri.upc.edu>
Date: Tue, 18 Oct 2011 14:04:33 +0000
Subject: [PATCH] install path option
---
CMakeLists.txt | 9 ++++++++-
Findiriutils.cmake | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdd9be8..f95af76 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 a435d92..3d62f89 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)
--
GitLab