Re: Build failed in Jenkins: kdelibs4support_master_qt5 #288

[šumski]

On Tuesday 21 of October 2014 20:33:41 šumski wrote:
> On Tuesday 21 of October 2014 19:58:55 KDE CI System wrote:
> > See <http://build.kde.org/job/kdelibs4support_master_qt5/288/changes>
> 
> ....
> 
> > In file included from
> > <http://build.kde.org/job/kdelibs4support_master_qt5/ws/src/kssl/kssl.cpp
> > >
> > 
> > :21:0:
> > <http://build.kde.org/job/kdelibs4support_master_qt5/ws/src/kssl/kssl.h>:
> > 2 4:26: fatal error: ksslsettings.h: No such file or directory #include
> > <ksslsettings.h>
> > 
> >                           ^
> > 
> > compilation terminated.
> 
> Looks like somehow at least the last KIO build didn't install KSSLSettings
> header(s). Could be a new CMake regression?
> 
So CMake release branch has a problem with ECMGenerateHeaders...
In particular, things go wrong when EGH_HEADER_NAMES matches 
EGH_REQUIRED_HEADERS. E.g. attached patch resolves the problem with 
KCoreAddons. Sending it, if it helps someone more familiar with CMake 
internals and/or ECMGenerateHeaders

> Cheers,
> Hrvoje
> 
> > _______________________________________________
> > Kde-frameworks-devel mailing list
> > Kde-frameworks-devel@kde.org
> > https://mail.kde.org/mailman/listinfo/kde-frameworks-devel

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 1dc5627..306a7c3 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -121,16 +121,16 @@ set_target_properties(KF5CoreAddons PROPERTIES VERSION   ${KCOREADDONS_VERSION_S
                                                EXPORT_NAME CoreAddons
 )
 
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES KAboutData
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES KSharedDataCache
     RELATIVE caching
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KAutoSaveFile
         KDirWatch
@@ -142,7 +142,7 @@ ecm_generate_headers(KCoreAddons_HEADERS
     RELATIVE io
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KCompositeJob
         KJob
@@ -151,7 +151,7 @@ ecm_generate_headers(KCoreAddons_HEADERS
     RELATIVE jobs
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KExportPlugin
         KPluginFactory
@@ -160,21 +160,21 @@ ecm_generate_headers(KCoreAddons_HEADERS
     RELATIVE plugin
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KRandom
         KRandomSequence
     RELATIVE randomness
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KMacroExpander
         KStringHandler
     RELATIVE text
     REQUIRED_HEADERS KCoreAddons_HEADERS
 )
-ecm_generate_headers(KCoreAddons_HEADERS
+ecm_generate_headers(KCoreAddons_CamelCase_HEADERS
     HEADER_NAMES
         KFormat
         KUser
@@ -189,6 +189,7 @@ install(TARGETS KF5CoreAddons EXPORT KF5CoreAddonsTargets ${KF5_INSTALL_TARGETS_
 
 install(FILES
     ${KCoreAddons_HEADERS}
+    ${KCoreAddons_CamelCase_HEADERS}
     ${CMAKE_CURRENT_BINARY_DIR}/kcoreaddons_export.h
     DESTINATION ${KF5_INCLUDE_INSTALL_DIR}/KCoreAddons COMPONENT Devel
 )

signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel