From 11e426bf8b2df10fc7a9f34c8653bf4e666ec076 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 29 Jun 2016 21:20:28 +0800 Subject: [PATCH] cmake: use full path for substitution and definitions Signed-off-by: Kefu Chai --- src/CMakeLists.txt | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b3880a2a9795..6a9e65af3697a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,17 +4,18 @@ enable_language(C ASM) include(GNUInstallDirs) # for erasure and compressor plugins set(CMAKE_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}) +set(CMAKE_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}) # to be compatible with configure_files shared with autoconfig -set(bindir ${CMAKE_INSTALL_BINDIR}) -set(sbindir ${CMAKE_INSTALL_SBINDIR}) -set(libdir ${CMAKE_INSTALL_LIBDIR}) -set(sysconfdir ${CMAKE_INSTALL_SYSCONFDIR}) -set(pkgdatadir ${CMAKE_INSTALL_DATADIR}) -set(datadir ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) +set(bindir ${CMAKE_INSTALL_FULL_BINDIR}) +set(sbindir ${CMAKE_INSTALL_FULL_SBINDIR}) +set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) +set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR}) +set(pkgdatadir ${CMAKE_INSTALL_FULL_DATADIR}) +set(datadir ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}) set(prefix ${CMAKE_INSTALL_PREFIX}) -add_definitions("-DCEPH_LIBDIR=\"${CMAKE_INSTALL_LIBDIR}\"") -add_definitions("-DCEPH_PKGLIBDIR=\"${CMAKE_INSTALL_PKGLIBDIR}\"") +add_definitions("-DCEPH_LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\"") +add_definitions("-DCEPH_PKGLIBDIR=\"${CMAKE_INSTALL_FULL_PKGLIBDIR}\"") add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE") set(CMAKE_ASM_COMPILER ${PROJECT_SOURCE_DIR}/src/yasm-wrapper) -- 2.39.5