From 5a837cee9eb99a985d0dc9b50ee8ccbecbd67117 Mon Sep 17 00:00:00 2001
From: Jeremie Deray <jeremie.deray@pal-robotics.com>
Date: Tue, 25 Oct 2016 14:38:55 +0200
Subject: [PATCH] fix cmake paths
---
CMakeLists.txt | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ad4da8c4..3fb2ce9b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,21 @@ SET(CMAKE_MACOSX_RPATH 1)
# The project name and the type of project
PROJECT(wolf)
+# EXECUTABLE_OUTPUT_PATH & LIBRARY_OUTPUT_PATH are
+# supercede by LIBRARY_OUTPUT_DIRECTORY & RUNTIME_OUTPUT_DIRECTORY
+# which are properly set by catkin
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-SET(CMAKE_INSTALL_PREFIX /usr/local)
+
+# We'll set the install prefix only is it's empty
+# which shouldn't be the case ...
+string(COMPARE EQUAL "${CMAKE_INSTALL_PREFIX}" "" result)
+IF(result)
+ # This path is actually default on linux
+ SET(CMAKE_INSTALL_PREFIX /usr/local)
+else()
+ message(STATUS "Installation path : " ${CMAKE_INSTALL_PREFIX})
+ENDIF()
IF (NOT CMAKE_BUILD_TYPE)
SET(CMAKE_BUILD_TYPE "DEBUG")
--
GitLab