summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeslie Zhai <xiangzhai83@gmail.com>2016-07-18 07:58:14 (GMT)
committerLeslie Zhai <xiangzhai83@gmail.com>2016-07-18 07:58:14 (GMT)
commitc0f4fb1f115b73b733bd9970d96b95a1204d9fb7 (patch)
treeb5f95279b482ba7ec6e5a6e8045f91b1078bcc2e
parentc5ebed95fe503c6f67d9765aa429e38dab85a081 (diff)
Update CMakeLists and testcaserefs/backups/branch-frameworks-1471310318
-rw-r--r--src/CMakeLists.txt23
-rw-r--r--tests/testkcd.cpp2
2 files changed, 14 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8976698..ed35fb8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,6 +62,7 @@ add_library(KF5::CompactDisc ALIAS KF5CompactDisc)
set_target_properties(KF5CompactDisc PROPERTIES
VERSION ${KCOMPACTDISC_VERSION}
SOVERSION ${KCOMPACTDISC_SOVERSION}
+ EXPORT_NAME CompactDisc
)
target_link_libraries(KF5CompactDisc
@@ -81,24 +82,26 @@ if (USE_WMLIB)
target_link_libraries(KF5CompactDisc ${CMAKE_THREAD_LIBS_INIT})
endif (USE_WMLIB)
-target_include_directories(KF5CompactDisc PUBLIC $<INSTALL_INTERFACE:${KF5_INCLUDE_INSTALL_DIR}/KCompactDisc>)
-ecm_generate_headers(KCOMPACTDISC_HEADERS
- HEADER_NAMES KCompactDisc
- PREFIX KCompactDisc
- REQUIRED_HEADERS KCOMPACTDISC_REQ_HEADERS
+target_include_directories(KF5CompactDisc INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc>")
+ecm_generate_headers(KCompactDisc_HEADERS
+ HEADER_NAMES
+ KCompactDisc
+ REQUIRED_HEADERS KCompactDisc_HEADERS
)
-generate_export_header(KF5CompactDisc BASE_NAME kcompactdisc)
+generate_export_header(KF5CompactDisc BASE_NAME KCompactDisc)
ecm_generate_pri_file(
BASE_NAME KCompactDisc
LIB_NAME KF5CompactDisc
DEPS "core dbus phonon4qt5 KCoreAddons KI18n Solid"
FILENAME_VAR PRI_FILENAME
+ INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc
)
-install(TARGETS KF5CompactDisc EXPORT KF5CompactDiscTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ${KCOMPACTDISC_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KCompactDisc/KCompactDisc COMPONENT Devel)
-install(FILES ${KCOMPACTDISC_REQ_HEADERS} DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KCompactDisc/kcompactdisc COMPONENT Devel)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_export.h DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KCompactDisc/kcompactdisc COMPONENT Devel)
+install(TARGETS KF5CompactDisc EXPORT KF5CompactDiscTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kcompactdisc_export.h
+ ${KCompactDisc_HEADERS}
+ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KCompactDisc COMPONENT Devel)
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/tests/testkcd.cpp b/tests/testkcd.cpp
index 991791e..e34266e 100644
--- a/tests/testkcd.cpp
+++ b/tests/testkcd.cpp
@@ -4,7 +4,7 @@
#include <QCoreApplication>
#include <QtGlobal>
-#include <KCompactDisc/KCompactDisc>
+#include <kcompactdisc.h>
class TestKCD : public QObject
{