]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: move include(GNUInstallDirs) up 35630/head
authorKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 22:33:13 +0000 (06:33 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 17 Jun 2020 22:33:15 +0000 (06:33 +0800)
so systemd/CMakeLists.txt can have access to the variables defined by
it. quote from https://cmake.org/cmake/help/latest/command/include.html.

> Variable reads and writes access the scope of the caller (dynamic
> scoping).

Signed-off-by: Kefu Chai <kchai@redhat.com>
CMakeLists.txt
src/CMakeLists.txt

index 714fa08a3d7ecfa0d714b572362f7d14eae8feaf..0d94cdbf74d89e68f05fc7fb42f291d838caa09b 100644 (file)
@@ -93,6 +93,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+include(GNUInstallDirs)
 include(CephChecks)
 
 set(CEPH_MAN_DIR "share/man" CACHE STRING "Install location for man pages (relative to prefix).")
index 801bbe5941f5bfba97a24a397f67ccc57681e048..7464ba63b952bcd1e4bb1c05e5079d3e033aaff4 100644 (file)
@@ -1,7 +1,6 @@
 include(GetGitRevisionDescription)
 include(CheckCXXCompilerFlag)
 
-include(GNUInstallDirs)
 # for erasure and compressor plugins
 set(CEPH_INSTALL_PKGLIBDIR ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME})
 set(CEPH_INSTALL_FULL_PKGLIBDIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME})