You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
38 lines
1.3 KiB
38 lines
1.3 KiB
10 years ago
|
From 7248b030c08859866d966fe7cfd3e788e4f8f7d1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aleix Pol <aleixpol@kde.org>
|
||
|
|
Date: Tue, 16 Sep 2014 15:13:05 +0200
|
||
|
|
Subject: [PATCH 11/16] Use "PackageKit" as the include namespace rather than
|
||
|
|
the library name
|
||
|
|
|
||
|
|
This way the project doesn't need to hard-code the qt version on the
|
||
|
|
source code.
|
||
|
|
|
||
|
|
Reviewed by Daniel Nicoletti
|
||
|
|
---
|
||
|
|
src/CMakeLists.txt | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||
|
|
index 9d5210f..c52e1b1 100755
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -101,13 +101,13 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${LIBNAME}.pc.in
|
||
|
|
${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc
|
||
|
|
@ONLY
|
||
|
|
)
|
||
|
|
-target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/PackageKit/${LIBNAME}/>")
|
||
|
|
+target_include_directories(${LIBNAME} INTERFACE "$<INSTALL_INTERFACE:include/${LIBNAME}/PackageKit/;include/${LIBNAME}>")
|
||
|
|
install(TARGETS ${LIBNAME} EXPORT PackageKitQtTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LIBNAME}.pc
|
||
|
|
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
|
||
|
|
)
|
||
|
|
install(FILES ${packagekitqt_HEADERS}
|
||
|
|
- DESTINATION include/PackageKit/${LIBNAME}
|
||
|
|
+ DESTINATION include/${LIBNAME}/PackageKit/
|
||
|
|
)
|
||
|
|
|
||
|
|
add_subdirectory(modules)
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|