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.
This commit is contained in:
parent
5413e696d3
commit
6e8424bed6
|
@ -84,8 +84,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||||
pkg_check_modules(BLKID REQUIRED blkid>=${BLKID_MIN_VERSION})
|
pkg_check_modules(BLKID REQUIRED blkid>=${BLKID_MIN_VERSION})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} src/)
|
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
||||||
# create a Config.cmake and a ConfigVersion.cmake file and install them
|
# create a Config.cmake and a ConfigVersion.cmake file and install them
|
||||||
|
|
|
@ -6,6 +6,10 @@
|
||||||
|
|
||||||
add_definitions(-DTRANSLATION_DOMAIN=\"kpmcore\")
|
add_definitions(-DTRANSLATION_DOMAIN=\"kpmcore\")
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${BLKID_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
include(backend/CMakeLists.txt)
|
include(backend/CMakeLists.txt)
|
||||||
include(core/CMakeLists.txt)
|
include(core/CMakeLists.txt)
|
||||||
include(util/CMakeLists.txt)
|
include(util/CMakeLists.txt)
|
||||||
|
|
Loading…
Reference in New Issue