From b6f52e39d6435af3296a7ef1ef9a8e823ce36aaa Mon Sep 17 00:00:00 2001 From: Martin Ejdestig Date: Tue, 20 Oct 2020 10:29:07 +0200 Subject: Simplify setting of CONFIGURATION_FILES_DIR in CMakeLists.txt (#247) By using CMAKE_INSTALL_FULL_SYSCONFDIR from GNUInstallDirs. It also fixes building with CMAKE_INSTALL_PREFIX=/ that would otherwise warn with: CMake Error at src/daemon/cmake_install.cmake:70 (file): file called with network path DESTINATION. This does not make sense when using DESTDIR. Specify local absolute path or remove DESTDIR environment variable. DESTINATION= //etc Signed-off-by: Martin Ejdestig --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 850dbcf..ee37382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,12 +171,7 @@ if(WITH_DLT_CXX11_EXT AND WITH_DLT_PKGCONFIG) install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-c++.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) endif() -if(CMAKE_INSTALL_PREFIX STREQUAL "/usr") - set(CONFIGURATION_FILES_DIR "/etc") -else() - set(CONFIGURATION_FILES_DIR "${CMAKE_INSTALL_PREFIX}/etc") -endif() - +set(CONFIGURATION_FILES_DIR ${CMAKE_INSTALL_FULL_SYSCONFDIR}) add_definitions(-DCONFIGURATION_FILES_DIR="${CONFIGURATION_FILES_DIR}") add_subdirectory(cmake) -- cgit v1.2.1