diff options
| author | Marco Residori <marco.residori@xse.de> | 2014-05-28 15:36:05 +0200 |
|---|---|---|
| committer | Marco Residori <marco.residori@xse.de> | 2014-05-28 15:36:05 +0200 |
| commit | be6bb6d254d991c2dceb7c4627954ba0c3b8716d (patch) | |
| tree | 63329ac9c8dc4589661669e838fcb51d92c25974 | |
| parent | c97c3e10cb0f38dfed5e17b995e33173567d2dbf (diff) | |
| download | positioning-be6bb6d254d991c2dceb7c4627954ba0c3b8716d.tar.gz | |
Modify CMakeLists.txt to solve problem with Yocto recipe
| -rw-r--r-- | gnss-service/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | sensors-service/CMakeLists.txt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/gnss-service/CMakeLists.txt b/gnss-service/CMakeLists.txt index 1288fca..510b8c7 100644 --- a/gnss-service/CMakeLists.txt +++ b/gnss-service/CMakeLists.txt @@ -31,8 +31,11 @@ option(WITH_REPLAYER option(WITH_TESTS "Compile test applications" OFF) -SET(CMAKE_INSTALL_RPATH "") -#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +if(${CMAKE_INSTALL_RPATH}) + set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PATH}:${CMAKE_INSTALL_RPATH}) +else(${CMAKE_INSTALL_RPATH}) + set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PATH}) +endif(${CMAKE_INSTALL_RPATH}) message(STATUS) message(STATUS "---------------------------------------------------------") diff --git a/sensors-service/CMakeLists.txt b/sensors-service/CMakeLists.txt index 07a7ba9..933f228 100644 --- a/sensors-service/CMakeLists.txt +++ b/sensors-service/CMakeLists.txt @@ -19,8 +19,11 @@ project(sensors-service) cmake_minimum_required(VERSION 2.6.0) -SET(CMAKE_INSTALL_RPATH "") -#SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +if(${CMAKE_INSTALL_RPATH}) + set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PATH}:${CMAKE_INSTALL_RPATH}) +else(${CMAKE_INSTALL_RPATH}) + set(CMAKE_INSTALL_RPATH ${LIBRARY_INSTALL_PATH}) +endif(${CMAKE_INSTALL_RPATH}) option(WITH_DLT "Enable DLT logging" OFF) |