diff options
| author | Tomasz Kondziola <tkondziola@gmail.com> | 2015-02-10 08:23:30 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-03-12 14:34:43 +0100 |
| commit | 236829d03ab066341e5122cfceaf500dea4f0bfb (patch) | |
| tree | 499f2958784ca5390acf9dae38934281301e39d1 /src | |
| parent | f90a5069f569aefa1c768ec7a336d982073f8ee2 (diff) | |
| download | DLT-daemon-236829d03ab066341e5122cfceaf500dea4f0bfb.tar.gz | |
resolves BUG-206: Install prefix should be configurable
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/daemon/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/dbus/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/system/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/tests/CMakeLists.txt | 8 |
4 files changed, 21 insertions, 12 deletions
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 5e2f780..11fb3ff 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -30,6 +30,8 @@ install(TARGETS dlt-daemon WORLD_EXECUTE WORLD_READ COMPONENT base) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf - DESTINATION /etc - COMPONENT base) +if(NOT CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf DESTINATION /etc COMPONENT base) +else(CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc COMPONENT base) +endif(NOT CMAKE_INSTALL_PREFIX) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 284a17b..9de3aa7 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -30,6 +30,9 @@ install(TARGETS dlt-dbus RUNTIME DESTINATION bin COMPONENT base) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-dbus.conf - DESTINATION /etc - COMPONENT base) +if(NOT CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-dbus.conf DESTINATION /etc COMPONENT base) +else(CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-dbus.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc COMPONENT base) +endif(NOT CMAKE_INSTALL_PREFIX) + diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index ce87914..5b14508 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -35,6 +35,8 @@ install(TARGETS dlt-system RUNTIME DESTINATION bin COMPONENT base) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf - DESTINATION /etc - COMPONENT base) +if(NOT CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf DESTINATION /etc COMPONENT base) +else(CMAKE_INSTALL_PREFIX) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc COMPONENT base) +endif(NOT CMAKE_INSTALL_PREFIX) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 6a6a962..d6366a4 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -57,6 +57,8 @@ install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-us RUNTIME DESTINATION bin COMPONENT base) -INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png - DESTINATION /usr/share/dlt-filetransfer -) +if(NOT CMAKE_INSTALL_PREFIX) + INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png DESTINATION /usr/share/dlt-filetransfer) +else(CMAKE_INSTALL_PREFIX) + INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/dlt-filetransfer) +endif(NOT CMAKE_INSTALL_PREFIX) |