From e0d403808a68c1c0309824c0df3b353a8aad7d16 Mon Sep 17 00:00:00 2001 From: Alexander Wenzel Date: Thu, 12 Mar 2015 09:47:27 +0100 Subject: 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 --- src/daemon/CMakeLists.txt | 6 +----- src/dbus/CMakeLists.txt | 6 +----- src/system/CMakeLists.txt | 6 +----- src/tests/CMakeLists.txt | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) (limited to 'src') 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) -- cgit v1.2.1