Hi,
Here's a patch adding CamelCase headers to KCoreAddons (attached).
If we agree that it's the proper way of doing it, I'll proceed to do it on
the rest of modules.
Cheers!
Aleix
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 389245c..ba6644a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_S
include(FeatureSummary)
include(CMakePackageConfigHelpers)
include(ECMSetupVersion)
+include(ECMGenerateHeaders)
include(KDEInstallDirs)
include(KDEFrameworkCompilerSettings)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 0e18f42..d9501b3 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -96,40 +96,32 @@ else()
target_link_libraries(KF5CoreAddons PRIVATE netapi32)
endif()
-if(IS_ABSOLUTE "${INCLUDE_INSTALL_DIR}")
- target_include_directories(KF5CoreAddons INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>" )
-else()
- target_include_directories(KF5CoreAddons INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}>" )
-endif()
+target_include_directories(KF5CoreAddons INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/kcoreaddons>" )
set_target_properties(KF5CoreAddons PROPERTIES VERSION ${KCOREADDONS_VERSION_STRING}
SOVERSION ${KCOREADDONS_SOVERSION}
EXPORT_NAME CoreAddons
)
+ecm_generate_headers(KAboutData REQUIRED_HEADERS KCoreAddons_HEADERS)
+ecm_generate_headers(KSharedDataCache REQUIRED_HEADERS KCoreAddons_HEADERS RELATIVE caching)
+ecm_generate_headers(KAutoSaveFile KDirWatch KMessage KProcess KBackup KUrlMimeData
+ RELATIVE io REQUIRED_HEADERS KCoreAddons_HEADERS)
+ecm_generate_headers(KCompositeJob KJob KJobTrackerInterface KJobUiDelegate
+ RELATIVE jobs REQUIRED_HEADERS KCoreAddons_HEADERS)
+ecm_generate_headers(KRandom KRandomSequence
+ RELATIVE randomness REQUIRED_HEADERS KCoreAddons_HEADERS)
+ecm_generate_headers(KMacroExpander KStringHandler
+ RELATIVE text REQUIRED_HEADERS KCoreAddons_HEADERS)
+ecm_generate_headers(KFormat KUser KShell
+ RELATIVE util REQUIRED_HEADERS KCoreAddons_HEADERS)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KCoreAddons DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
+
install(TARGETS KF5CoreAddons EXPORT KF5CoreAddonsTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
- kaboutdata.h
- caching/kshareddatacache.h
- io/kautosavefile.h
- io/kdirwatch.h
- io/kmessage.h
- io/kprocess.h
- io/kbackup.h
- io/kurlmimedata.h
+ ${KCoreAddons_HEADERS}
io/kfilesystemtype_p.h #Needed for building kio, KFileSystemType
- jobs/kcompositejob.h
- jobs/kjob.h
- jobs/kjobtrackerinterface.h
- jobs/kjobuidelegate.h
- randomness/krandom.h
- randomness/krandomsequence.h
- text/kmacroexpander.h
- text/kstringhandler.h
- util/kformat.h
- util/kuser.h
- util/kshell.h
${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_export.h
- DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kcoreaddons COMPONENT Devel
)
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
