diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-03-12 09:47:27 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-03-12 14:34:46 +0100 |
| commit | e0d403808a68c1c0309824c0df3b353a8aad7d16 (patch) | |
| tree | 9eff98f85a010fc2c26490cabcdf4dd15fee28f2 | |
| parent | e27c6381ad45260e7ced70d9b39a8862521e84e4 (diff) | |
| download | DLT-daemon-e0d403808a68c1c0309824c0df3b353a8aad7d16.tar.gz | |
Fix PREFIX. Works now with the default PREFIX (/usr/local/) and with the user PREFIX (e.g. /temp/test_with_pref). PREFIX Fix for filetransfer directory (PREFIX/share/).
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | src/daemon/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/dbus/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/system/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/tests/CMakeLists.txt | 6 |
5 files changed, 4 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27da17f..d55e82f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,6 @@ project( automotive-dlt ) mark_as_advanced( CMAKE_BACKWARDS_COMPATIBILITY) set( CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE ) -if(NOT CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "/usr") -endif(NOT CMAKE_INSTALL_PREFIX) # Set version parameters set( DLT_MAJOR_VERSION 2) diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 11fb3ff..8ab6711 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -30,8 +30,4 @@ install(TARGETS dlt-daemon WORLD_EXECUTE WORLD_READ 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) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt.conf DESTINATION /etc COMPONENT base) diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 9de3aa7..b1c222c 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -30,9 +30,5 @@ install(TARGETS dlt-dbus RUNTIME DESTINATION bin 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) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-dbus.conf DESTINATION /etc COMPONENT base) diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 5b14508..7768b5a 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -35,8 +35,4 @@ install(TARGETS dlt-system RUNTIME DESTINATION bin 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) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlt-system.conf DESTINATION /etc COMPONENT base) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index d6366a4..b36454d 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -57,8 +57,4 @@ install(TARGETS dlt-test-multi-process dlt-test-multi-process-client dlt-test-us RUNTIME DESTINATION bin COMPONENT base) -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) +INSTALL(FILES dlt-test-filetransfer-file dlt-test-filetransfer-image.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/dlt-filetransfer) |