From 6e8424bed659920fa36ed42e3caff152e755bdd1 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 16 Nov 2020 20:06:36 +0100 Subject: [PATCH] Clean up include dirs Move include of BLKID_INCLUDE_DIRS into scope it is used. UUID_INCLUDE_DIRS is unused, left over from before partitionmanager switched away from libuuid in 26e7f9d7ef306d61380e1c8965feb83bb6b07d18 . Explicit Qt5Core_INCLUDE_DIRS no longer needed. src/ is automatically available for kpmcore target, also exposed in its build link interface. --- CMakeLists.txt | 2 -- src/CMakeLists.txt | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bb6f71..f63b069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,8 +84,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") pkg_check_modules(BLKID REQUIRED blkid>=${BLKID_MIN_VERSION}) endif() -include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} src/) - add_subdirectory(src) # create a Config.cmake and a ConfigVersion.cmake file and install them diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a51334a..05e3f49 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,6 +6,10 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kpmcore\") +include_directories( + ${BLKID_INCLUDE_DIRS} +) + include(backend/CMakeLists.txt) include(core/CMakeLists.txt) include(util/CMakeLists.txt)