diff --git a/classes/cmake-lib.bbclass b/classes/cmake-lib.bbclass
index 2458e5dc..a0a0cfee 100644
--- a/classes/cmake-lib.bbclass
+++ b/classes/cmake-lib.bbclass
@@ -3,11 +3,11 @@
 #
 # Alignment is controlled by
 #
-# CMAKE_HIDE_ERROR[unique-id] = "dir, search, replace"
+# CMAKE_ALIGN_SYSROOT[unique-id] = "dir, search, replace"
 #
 # 'unique-id': 
 #    string value of your choice e.g. "1", "2"...
-#    !!COMMON PITFALL!!: Copy & Paste CMAKE_HIDE_ERROR lines without updating unique-id -> 
+#    !!COMMON PITFALL!!: Copy & Paste CMAKE_ALIGN_SYSROOT lines without updating unique-id -> 
 #    not all lines are evaluated!!
 #
 # 'dir':
@@ -44,18 +44,18 @@
 # filename for the file containg full names of all cmakefiles staged
 CMAKEINSTALLED = "${WORKDIR}/staged_cmake_files"
 
-# 1. basic checks for CMAKE_HIDE_ERROR
+# 1. basic checks for CMAKE_ALIGN_SYSROOT
 python () {
-    cmakehideflags = d.getVarFlags("CMAKE_HIDE_ERROR") or {}
+    cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
     pn = d.getVar('PN', True)
     if cmakehideflags:
         for flag, flagval in sorted(cmakehideflags.items()):
             items = flagval.split(",")
             num = len(items)
             if num != 3:
-                bb.fatal('CMAKE_HIDE_ERROR[%s] requires 3 parameters (dir, search, replace) in %s' % (flag, pn))
+                bb.fatal('CMAKE_ALIGN_SYSROOT[%s] requires 3 parameters (dir, search, replace) in %s' % (flag, pn))
     else:
-        bb.fatal('The recipe %s inherits cmake-lib but does not set CMAKE_HIDE_ERROR' % pn)
+        bb.fatal('The recipe %s inherits cmake-lib but does not set CMAKE_ALIGN_SYSROOT' % pn)
 }
 
 # 2. remove tmp file from last build
@@ -75,11 +75,11 @@ sysroot_stage_dir_append() {
     done
 }
 
-# 4. Handle CMAKE_HIDE_ERROR
+# 4. Handle CMAKE_ALIGN_SYSROOT
 python do_populate_sysroot_append() {
     pn = d.getVar('PN', True)
 
-    # parse single parameter in CMAKE_HIDE_ERROR[..] and return array of line strings extracted
+    # parse single parameter in CMAKE_ALIGN_SYSROOT[..] and return array of line strings extracted
     def parseparam(param, flag):
         param = param.strip()
         if len(param) > 2:
@@ -116,17 +116,17 @@ python do_populate_sysroot_append() {
                 pipe.close()
                 return str
             else:
-                bb.fatal("CMAKE_HIDE_ERROR[%s] contains an invalid parameter '%s%s' in %s" % (flag, cmd, cmdparam, pn))
+                bb.fatal("CMAKE_ALIGN_SYSROOT[%s] contains an invalid parameter '%s%s' in %s" % (flag, cmd, cmdparam, pn))
         else:
-            bb.fatal("Parameter %s is too short for CMAKE_HIDE_ERROR[%s] in %s" % (param, flag, pn))
+            bb.fatal("Parameter %s is too short for CMAKE_ALIGN_SYSROOT[%s] in %s" % (param, flag, pn))
 
     # first check if cmake files were installed to sysroot
     tmpfile = d.getVar('CMAKEINSTALLED', True)
     if (not os.path.isfile(tmpfile)) or os.path.getsize(tmpfile) == 0:
         bb.warn("There were no cmake files installed by %s" % pn)
     else:
-        # parse CMAKE_HIDE_ERROR[..]
-        cmakehideflags = d.getVarFlags("CMAKE_HIDE_ERROR") or {}
+        # parse CMAKE_ALIGN_SYSROOT[..]
+        cmakehideflags = d.getVarFlags("CMAKE_ALIGN_SYSROOT") or {}
 
         for flag, flagval in sorted(cmakehideflags.items()):
             items = flagval.split(",")
@@ -134,18 +134,18 @@ python do_populate_sysroot_append() {
             # 1. cmake-subdirectory in sysroot
             cmakedir = d.expand(items[0])
             if len(cmakedir) == 0:
-                bb.fatal('Directory in CMAKE_HIDE_ERROR[%s] must not be empty in %s' % (flag, pn))
+                bb.fatal('Directory in CMAKE_ALIGN_SYSROOT[%s] must not be empty in %s' % (flag, pn))
             # check if this directory is created by us
             pipe = os.popen('grep %s %s' % (cmakedir, d.getVar('CMAKEINSTALLED', True)))
             matching_files = pipe.readlines()
             pipe.close()
             if len(matching_files) == 0:
-                bb.warn("No matching cmake file found for directory '%s' set by CMAKE_HIDE_ERROR[%s] in %s" % (cmakedir, flag, pn))
+                bb.warn("No matching cmake file found for directory '%s' set by CMAKE_ALIGN_SYSROOT[%s] in %s" % (cmakedir, flag, pn))
 
             # 2. search
             search = parseparam(items[1], flag)
             if len(search) == 0:
-                bb.warn("Search string must not be empty - see CMAKE_HIDE_ERROR[%s] in %s" % (flag, pn))
+                bb.warn("Search string must not be empty - see CMAKE_ALIGN_SYSROOT[%s] in %s" % (flag, pn))
 
             # 3. replace
             replace = parseparam(items[2], flag)
@@ -177,9 +177,9 @@ python do_populate_sysroot_append() {
                             f.write(cmakestr_new)
                             f.close()
                 if not replacement_performed:
-                    bb.warn("No cmake replacements performed in %s for CMAKE_HIDE_ERROR[%s]" % (pn, flag))
+                    bb.warn("No cmake replacements performed in %s for CMAKE_ALIGN_SYSROOT[%s]" % (pn, flag))
 }
 
-do_populate_sysroot[vardeps] += "CMAKE_HIDE_ERROR"
-# REVISIT: CMAKE_HIDE_ERROR cause configure rerun
-sysroot_cleansstate[vardeps] += "CMAKE_HIDE_ERROR"
+do_populate_sysroot[vardeps] += "CMAKE_ALIGN_SYSROOT"
+# REVISIT: CMAKE_ALIGN_SYSROOT cause configure rerun
+sysroot_cleansstate[vardeps] += "CMAKE_ALIGN_SYSROOT"
diff --git a/extends-meta-qt5/qttools_5.4.1.bbappend b/extends-meta-qt5/qttools_5.4.1.bbappend
index ebce32bf..aab32c2f 100644
--- a/extends-meta-qt5/qttools_5.4.1.bbappend
+++ b/extends-meta-qt5/qttools_5.4.1.bbappend
@@ -3,5 +3,5 @@ inherit cmake-lib
 DEPENDS += "${BPN}-native"
 
 # native binaries
-CMAKE_HIDE_ERROR[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
-CMAKE_HIDE_ERROR[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[1] = "Qt5Help, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "Qt5LinguistTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
diff --git a/recipes-hawaii/greenisland/greenisland_git.bb b/recipes-hawaii/greenisland/greenisland_git.bb
index 743569d4..d64b54ee 100644
--- a/recipes-hawaii/greenisland/greenisland_git.bb
+++ b/recipes-hawaii/greenisland/greenisland_git.bb
@@ -30,8 +30,8 @@ EXTRA_OECMAKE += " \
 "
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "GreenIsland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "GreenIsland, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${libdir}/qml/GreenIsland"
 FILES_${PN}-dbg += "${libdir}/qml/GreenIsland/.debug"
diff --git a/recipes-hawaii/libhawaii/libhawaii_0.3.0.bb b/recipes-hawaii/libhawaii/libhawaii_0.3.0.bb
index 5e936b17..e6cb66fb 100644
--- a/recipes-hawaii/libhawaii/libhawaii_0.3.0.bb
+++ b/recipes-hawaii/libhawaii/libhawaii_0.3.0.bb
@@ -12,8 +12,8 @@ SRCREV = "20f7fcf49c90108c42f3ce0b7357775a846dfc2d"
 
 S = "${WORKDIR}/git"
 
-CMAKE_HIDE_ERROR[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "Hawaii, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "Hawaii, -S${includedir}, -S${STAGING_INCDIR}"
 
 
 FILES_${PN} += "${libdir}/hawaii"
diff --git a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
index b9ab877e..a99e0bc4 100644
--- a/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
+++ b/recipes-hawaii/qtconfiguration/qtconfiguration_0.3.0.bb
@@ -16,7 +16,7 @@ SRCREV = "804739d73de982fc144ff45653c243cefcfa79cb"
 
 S = "${WORKDIR}/git"
 
-CMAKE_HIDE_ERROR[1] = "QtConfiguration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[1] = "QtConfiguration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 
 FILES_${PN} += "${libdir}/hawaii/qml/Hawaii/Configuration"
 FILES_${PN}-dbg += "${libdir}/hawaii/qml/Hawaii/Configuration/.debug"
diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
index 4e4632a9..aa822fc4 100644
--- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
+++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.bb
@@ -5,5 +5,5 @@ inherit cmake-lib
 DEPENDS += "${BPN}-native libpcre"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5JS, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5JS, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5JS, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
index 84c37907..ad911a15 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -33,11 +33,11 @@ DEPENDS += " \
 #EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KDELibs4, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "KDELibs4, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[1] = "KDELibs4, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "KDELibs4, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
 
 # native executables
-CMAKE_HIDE_ERROR[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[3] = "KF5KDELibs4Support, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += " \
 	${datadir}/k*5 \
diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
index bf240cc5..7f848c98 100644
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -35,8 +35,8 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "023518c1fd0bcd215ceeb354cf370a1d"
 SRC_URI[sha256sum] = "6b10e3ebba3bb19a7f5292b6adcfccb8d757bd15a7f489544a152027d510017c"
 
-CMAKE_HIDE_ERROR[1] = "KF5KHtml, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5KHtml, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5KHtml, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
index d6b1aa36..8f599c12 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb
@@ -13,11 +13,11 @@ SRC_URI[md5sum] = "30d32919babdf97c40cfccf1cd1676cb"
 SRC_URI[sha256sum] = "7d29f773194d1a4bdfc7391b186ed78bce732dfad5b840ed38543e8b87da5813"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5JsEmbed, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5JsEmbed, -S${includedir}, -S${STAGING_INCDIR}"
 
 # HACK for kjscmd5: to avoid more native qt5 extensions we simply link to icemaker
 # created by kjs-native which is in the dependency chain by kjs. kjs-native has
 # only few dependencies and nothing needs kjscmd5 to build. The only reason to
 # do this hack is to make cmake checks happy.
-CMAKE_HIDE_ERROR[3] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/icemaker"
+CMAKE_ALIGN_SYSROOT[3] = "KF5JsEmbed, -S${bindir}/kjscmd5, -S${STAGING_BINDIR_NATIVE}/icemaker"
diff --git a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
index 26a22498..b11ec388 100644
--- a/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/krunner/krunner.bb
@@ -12,8 +12,8 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "ebc23e7ff249c7b1a2c95175d1c0f7bc"
 SRC_URI[sha256sum] = "90532e715fe9d133efd8c299c5d3bdffa74ce56bcf36d36284461bae9e291a70"
 
-CMAKE_HIDE_ERROR[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Runner, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Runner, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/k*5 ${libdir}/qml/org/kde"
 FILES_${PN}-dbg += "${libdir}/qml/org/kde/*/.debug"
diff --git a/recipes-kde/kf5/tier1/attica/attica.bb b/recipes-kde/kf5/tier1/attica/attica.bb
index d0437042..a77f90f2 100644
--- a/recipes-kde/kf5/tier1/attica/attica.bb
+++ b/recipes-kde/kf5/tier1/attica/attica.bb
@@ -11,6 +11,6 @@ SRC_URI[sha256sum] = "ebc51ef26ecb30e94fea243e18e5a4f785188b00033e6081a9eb7c743a
 
 PV = "${KF5_VERSION}"
 
-CMAKE_HIDE_ERROR[1] = "KF5Attica, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Attica, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Attica, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Attica, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/karchive/karchive.bb b/recipes-kde/kf5/tier1/karchive/karchive.bb
index 5dbb7af9..e808e097 100644
--- a/recipes-kde/kf5/tier1/karchive/karchive.bb
+++ b/recipes-kde/kf5/tier1/karchive/karchive.bb
@@ -4,5 +4,5 @@ DEPENDS += "${BPN}-native"
 
 inherit cmake-lib
 
-CMAKE_HIDE_ERROR[1] = "KF5Archive, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Archive, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Archive, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Archive, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
index b3cb1682..fd9a97ee 100644
--- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
+++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb
@@ -12,7 +12,7 @@ SRC_URI[md5sum] = "694923c6ca1f5a427aa7c7700190bfd5"
 SRC_URI[sha256sum] = "ec0b7073cc9f9552258d2a8c4626f8119bfbc482df7a0771d97b94fa6041edc6"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Codecs, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Codecs, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Codecs, -S${includedir}, -S${STAGING_INCDIR}"
 
 
diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
index c81e4a29..1f6daab5 100644
--- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb
+++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb
@@ -7,11 +7,11 @@ DEPENDS += "${BPN}-native"
 SRC_URI += "file://0003-kconf_update-fix-paths.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Config, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Config, -S${includedir}, -S${STAGING_INCDIR}"
 # native executables
-CMAKE_HIDE_ERROR[3] = "KF5Config, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
-CMAKE_HIDE_ERROR[4] = "KF5Config, -S${libexecdir}, -S${STAGING_LIBDIR_NATIVE}/${BPN}"
+CMAKE_ALIGN_SYSROOT[3] = "KF5Config, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[4] = "KF5Config, -S${libexecdir}, -S${STAGING_LIBDIR_NATIVE}/${BPN}"
 
 PACKAGES =+ "${PN}-bin"
 
diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
index a6764aa3..b7329a8c 100644
--- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
+++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.bb
@@ -5,10 +5,10 @@ inherit cmake-lib
 DEPENDS += "${BPN}-native"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5CoreAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5CoreAddons, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5CoreAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5CoreAddons, -S${includedir}, -S${STAGING_INCDIR}"
 # native executables
-CMAKE_HIDE_ERROR[3] = "KF5CoreAddons, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[3] = "KF5CoreAddons, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 
 PACKAGES =+ "${PN}-bin"
 
diff --git a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
index 25a49cb7..d667dfae 100644
--- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
+++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb
@@ -14,6 +14,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "71109ffe31aa72fb8afbc56215e9c8d1"
 SRC_URI[sha256sum] = "b1cb1c47c7d726c55b6a50fbd111095a3b5dc8426be5f8aefaa3efcb0ab000ab"
 
-CMAKE_HIDE_ERROR[1] = "KF5DBusAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5DBusAddons, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5DBusAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5DBusAddons, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
index f0dd5768..10388f9c 100644
--- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
+++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb
@@ -13,6 +13,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "c5d91b6f92e470feec25b6ba147a44a4"
 SRC_URI[sha256sum] = "6f6f36def7f4edc3db47ba9276fd0e8fda6d8310970d0a70f22a38e7bad21a7d"
 
-CMAKE_HIDE_ERROR[1] = "KF5DNSSD, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5DNSSD, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5DNSSD, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5DNSSD, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
index 45057af9..9af0410f 100644
--- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
+++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb
@@ -15,6 +15,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "d82fde58b0fb646aa8b3593720e8a22f"
 SRC_URI[sha256sum] = "82a3dd36debe87d682a7df2aad7c4d0f8fab66f2eea26bd5fe02ccd7adbaa085"
 
-CMAKE_HIDE_ERROR[1] = "KF5GuiAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5GuiAddons, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5GuiAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5GuiAddons, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n.bb b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
index 5ec0fac4..6d309005 100644
--- a/recipes-kde/kf5/tier1/ki18n/ki18n.bb
+++ b/recipes-kde/kf5/tier1/ki18n/ki18n.bb
@@ -3,8 +3,8 @@ require ${BPN}.inc
 inherit cmake-lib pythonnative
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5I18n, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5I18n, -S${includedir}, -S${STAGING_INCDIR}"
 # revisit python?
 
 DEPENDS += "${BPN}-native qtscript"
diff --git a/recipes-kde/kf5/tier1/kidletime/kidletime.bb b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
index 0abd991c..45dc7095 100644
--- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb
+++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb
@@ -16,5 +16,5 @@ SRC_URI[sha256sum] = "7ee7d58a6c999debd6582add8bc4def609c87a25456c09d345402fe1b2
 SRC_URI += "file://0001-Do-not-search-for-Qt5X11Extras-in-x-less-environment.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5IdleTime, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5IdleTime, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5IdleTime, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5IdleTime, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
index 50b465b5..f5055980 100644
--- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
+++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb
@@ -10,6 +10,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "1906bbf0023fe8c46af589699a50d791"
 SRC_URI[sha256sum] = "f2018f8a16572fc188c135a309747dbf899d8879e587bc93c358a915527dd7d4"
 
-CMAKE_HIDE_ERROR[1] = "KF5ItemModels, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5ItemModels, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5ItemModels, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5ItemModels, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
index 78133009..3b698182 100644
--- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
+++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb
@@ -12,5 +12,5 @@ SRC_URI[md5sum] = "fabb150da1ca12c8bb63981b2cff84a0"
 SRC_URI[sha256sum] = "cd790904c36c4ff61e4311765a83b5ee2f62f4d1afe328439b2295baccf03ed3"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5ItemViews, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5ItemViews, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5ItemViews, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5ItemViews, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier1/kplotting/kplotting.bb b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
index a043963e..60776461 100644
--- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb
+++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb
@@ -11,5 +11,5 @@ SRC_URI[md5sum] = "b8a053219aa6fd8273212b7faa4c39a0"
 SRC_URI[sha256sum] = "b107f53c51e273f8cfe5cca3e823f318d6a7a8d096601768abb1d184f9773196"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Plotting, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Plotting, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Plotting, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Plotting, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
index fa0632ca..dfa103e5 100644
--- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
+++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb
@@ -13,6 +13,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "951dfbb91016e4f7982feb18602087f5"
 SRC_URI[sha256sum] = "2cb079363073074e82ad94e26c8ea429c50ef0f49873dd2656b8ab2a6377c42b"
 
-CMAKE_HIDE_ERROR[1] = "KF5WidgetsAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5WidgetsAddons, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5WidgetsAddons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5WidgetsAddons, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
index bf409d00..a051313b 100644
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -12,6 +12,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "abc30887409acf05d1e6e22f1c3b98e8"
 SRC_URI[sha256sum] = "c5a8845c0252a57f4fdc6e3a58304107631343f64ca619788adf197d7f578aa5"
 
-CMAKE_HIDE_ERROR[1] = "KF5WindowSystem, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5WindowSystem, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5WindowSystem, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
index 96943789..e8c6ddf5 100644
--- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
+++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "ed270d6e56214107d23ca3d8f067d99e"
 SRC_URI[sha256sum] = "7f8858bbf90a6cd0e64dbd8b2223fc16225f6d8415e9ceb028616d4d99b0891d"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5NetworkManagerQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5NetworkManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5NetworkManagerQt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5NetworkManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
 
 #FILES_${PN} += "${datadir}/k*5"
diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb
index 781fcaa6..5901e340 100644
--- a/recipes-kde/kf5/tier1/solid/solid.bb
+++ b/recipes-kde/kf5/tier1/solid/solid.bb
@@ -12,8 +12,8 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "85fa6a920e9634af9cd2acdf2aca71a9"
 SRC_URI[sha256sum] = "03fb4206f025eed4f87a453311a6e620430072114b929e8a225e28fa0a8c121f"
 
-CMAKE_HIDE_ERROR[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
-CMAKE_HIDE_ERROR[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Solid, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Solid, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${libdir}/qml"
 FILES_${PN}-dbg += "${libdir}/qml/org/kde/${BPN}/.debug"
diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb
index c9ab33f5..628564fd 100644
--- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb
+++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb
@@ -11,6 +11,6 @@ do_configure_append() {
 	sed -i 's:\./parsetrigrams:${STAGING_BINDIR_NATIVE}/parsetrigrams:' ${B}/data/CMakeFiles/trigrams_sonnet.dir/build.make
 }
 
-CMAKE_HIDE_ERROR[1] = "KF5Sonnet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Sonnet, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Sonnet, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
index b73237b1..fee6a9dd 100644
--- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
+++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb
@@ -11,5 +11,5 @@ SRC_URI[md5sum] = "42a2e0afa725453e3773722e2a8c29a6"
 SRC_URI[sha256sum] = "2c540bb37aafaa345c06c6d8469d3b70ba9427c202ebdfbc06c5b5994f8df039"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5ThreadWeaver, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5ThreadWeaver, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5ThreadWeaver, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5ThreadWeaver, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb
index 94972162..2bed13e1 100644
--- a/recipes-kde/kf5/tier2/kauth/kauth.bb
+++ b/recipes-kde/kf5/tier2/kauth/kauth.bb
@@ -7,11 +7,11 @@ DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1"
 EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Auth, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Auth, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Auth, -S${includedir}, -S${STAGING_INCDIR}"
 
 # executables
-CMAKE_HIDE_ERROR[3] = "KF5Auth, -S${libexecdir}/kauth-policy-gen, -S${STAGING_LIBDIR_NATIVE}/${BPN}/kauth-policy-gen"
+CMAKE_ALIGN_SYSROOT[3] = "KF5Auth, -S${libexecdir}/kauth-policy-gen, -S${STAGING_LIBDIR_NATIVE}/${BPN}/kauth-policy-gen"
 
 FILES_${PN} += "${libdir}/plugins"
 FILES_${PN}-dbg += "${libdir}/plugins/*/*/.debug"
diff --git a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
index fcc280d5..c9ddaa39 100644
--- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
+++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb
@@ -13,5 +13,5 @@ SRC_URI[md5sum] = "d8c49357e334f5992df7a0863b08bed7"
 SRC_URI[sha256sum] = "8b830f1b58f1f0b618455d8be08b48b117530e45e3207f23f5a7e3958dfe278f"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Completion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Completion, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Completion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Completion, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
index 079999ac..c35134a1 100644
--- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb
+++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb
@@ -15,5 +15,5 @@ SRC_URI[sha256sum] = "5968694919e374b432b2e53ad1f6c15a018011ecd3c45d0b2d9dd586af
 SRC_URI += "file://0001-align-path-to-drkonqi.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Crash, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Crash, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Crash, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Crash, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
index dc650c76..fdca47b3 100644
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools-native.bb
@@ -10,5 +10,5 @@ SRC_URI += " \
 "
 
 # make meinproc5 find kdoctools data
-CMAKE_HIDE_ERROR[1] = "KF5DocToolsMacros.cmake, -s--stylesheet, -S--srcdir ${STAGING_DATADIR_NATIVE}/kf5/kdoctools --stylesheet"
+CMAKE_ALIGN_SYSROOT[1] = "KF5DocToolsMacros.cmake, -s--stylesheet, -S--srcdir ${STAGING_DATADIR_NATIVE}/kf5/kdoctools --stylesheet"
 
diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
index d1a0f89d..16923e18 100644
--- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
+++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.bb
@@ -14,12 +14,12 @@ do_configure_append() {
 }
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5DocTools, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5DocTools, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5DocTools, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5DocTools, -S${includedir}, -S${STAGING_INCDIR}"
 # native binaries
-CMAKE_HIDE_ERROR[3] = "KF5DocTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[3] = "KF5DocTools, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 
 # make meinproc5 find kdoctools data
-CMAKE_HIDE_ERROR[4] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -SCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${STAGING_DATADIR}/kf5/kdoctools"
+CMAKE_ALIGN_SYSROOT[4] = "KF5DocToolsMacros.cmake, -sCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE}, -SCOMMAND ${KDOCTOOLS_MEINPROC_EXECUTABLE} --srcdir ${STAGING_DATADIR}/kf5/kdoctools"
 
 FILES_${PN}-dev += "${datadir}/kf5/kdoctools/customization"
diff --git a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
index 69e0daea..05ddc261 100644
--- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
+++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "e1d34c6f5275b9409e2161198baf8735"
 SRC_URI[sha256sum] = "c7fca852442a00417c4acb9413124cf1a3f937eef0611f2ac3a74fb0a4e1643b"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5JobWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5JobWidgets, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5JobWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5JobWidgets, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/dbus-1"
diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.bb b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
index 3492c0d8..b481aaeb 100644
--- a/recipes-kde/kf5/tier2/kpackage/kpackage.bb
+++ b/recipes-kde/kf5/tier2/kpackage/kpackage.bb
@@ -14,7 +14,7 @@ SRC_URI[md5sum] = "c30bb0ce023cc7f22dd2c3c092f4da56"
 SRC_URI[sha256sum] = "2a64e01a713c0804ee4e0961da11be538a602653f6e932fd03c0dbdd0a469ef8"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Package, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Package, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Package, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Package, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/k*5"
diff --git a/recipes-kde/kf5/tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb
index b402f3e6..0ef83bf5 100644
--- a/recipes-kde/kf5/tier2/kpty/kpty.bb
+++ b/recipes-kde/kf5/tier2/kpty/kpty.bb
@@ -13,6 +13,6 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "a4387e3cfdc01b79e2983c98a4afeb01"
 SRC_URI[sha256sum] = "921f9172d26402326f093be321f84c3b3f8b105227957e0ed3a708d7e1389d79"
 
-CMAKE_HIDE_ERROR[1] = "KF5Pty, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Pty, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Pty, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Pty, -S${includedir}, -S${STAGING_INCDIR}"
 
diff --git a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
index 85d9952a..175be76d 100644
--- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
+++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb
@@ -13,5 +13,5 @@ SRC_URI[md5sum] = "1d9b3568bd01c9f67c0575eb3e990413"
 SRC_URI[sha256sum] = "a30c350ae511e5e9c27b44372d02f11d6afee48e7781ce1685895bbdfeca1cfa"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5UnitConversion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5UnitConversion, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5UnitConversion, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5UnitConversion, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
index bef3ebbb..dbe9c5cf 100644
--- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb
+++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb
@@ -15,8 +15,8 @@ SRC_URI[sha256sum] = "4affc5f4d20f1b923439a7da7e31defbf00e2d8fd1d182d0910b6cac6f
 SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Activities, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Activities, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/k*5 ${libdir}/plugins ${libdir}/qml/org/kde"
 FILES_${PN}-dbg += "${libdir}/plugins/.debug ${libdir}/plugins/*/.debug ${libdir}/qml/org/kde/*/.debug"
diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
index 3a6e88d5..49c94996 100644
--- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
+++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb
@@ -13,5 +13,5 @@ SRC_URI[md5sum] = "3f579762a22fa0c91731ea8d2c44cbb5"
 SRC_URI[sha256sum] = "11631f3f64bc54d80d1b0ce0d11318e50daec2d64efa91154b1929596a54342f"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Bookmarks, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Bookmarks, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Bookmarks, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Bookmarks, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
index b9d537fc..5e158474 100644
--- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
+++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "88f259c3bc692a2d94bde5618d8a7166"
 SRC_URI[sha256sum] = "3c4915f8686242ac7c39b515c44ce56074c953fa5cf207e3fc6cd6f25a25a17e"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5KCMUtils, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5KCMUtils, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5KCMUtils, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5KCMUtils, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/kservicetypes5"
diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
index 6e7b1f8d..96829adc 100644
--- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
+++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "c8c0acdb6a0fea7cbb3058613b659751"
 SRC_URI[sha256sum] = "097be090e442ff2b559267ee60e24002858a8b26f427984816d0f8da22797b22"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5ConfigWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5ConfigWidgets, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5ConfigWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5ConfigWidgets, -S${includedir}, -S${STAGING_INCDIR}"
 
 RDEPENDS_${PN} += "perl"
diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
index 4a64041f..f9560c45 100644
--- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
+++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb
@@ -14,8 +14,8 @@ SRC_URI[md5sum] = "04b6eedce4147f97c8d1ed7bb186fed3"
 SRC_URI[sha256sum] = "563848af5392a23f94e8ce185ac1878749d64cc4c0327f646b34ebd10887dea3"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Declarative, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Declarative, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Declarative, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Declarative, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${libdir}/qml/org/kde"
 FILES_${PN}-dbg += "${libdir}/qml/org/kde/*/.debug ${libdir}/qml/org/kde/*/*/.debug"
diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb
index fd93514b..10cb670b 100644
--- a/recipes-kde/kf5/tier3/kded/kded.bb
+++ b/recipes-kde/kf5/tier3/kded/kded.bb
@@ -13,11 +13,11 @@ SRC_URI[md5sum] = "78a4b41a985b47d7743608c3b7e988aa"
 SRC_URI[sha256sum] = "5b031d493c8a79ec7d6e60c232f3ffc220a68f4b81519f33000a45933655a8a1"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KDED, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KDED, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KDED, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KDED, -S${includedir}, -S${STAGING_INCDIR}"
 
 # executables REVISIT -> native 
-CMAKE_HIDE_ERROR[3] = "KDED, -S${bindir}, -S${STAGING_BINDIR}"
+CMAKE_ALIGN_SYSROOT[3] = "KDED, -S${bindir}, -S${STAGING_BINDIR}"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/libkdeinit5_kded5.so"
 FILES_${PN}-dev = "${libdir}/cmake"
diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
index 3109a1c7..e187ddee 100644
--- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
+++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb
@@ -31,10 +31,10 @@ PACKAGECONFIG[kplotting] = "-DWITH_KPLOTTING=ON,,kplotting"
 PACKAGECONFIG[kdewebkit] = "-DWITH_KDEWEBKIT=ON,,kdewebkit"
 
 # cross headers
-CMAKE_HIDE_ERROR[1] = "KF5DesignerPlugin, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -S${includedir}, -S${STAGING_INCDIR}"
 
 # native binaries
-CMAKE_HIDE_ERROR[2] = "KF5DesignerPlugin, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
+CMAKE_ALIGN_SYSROOT[2] = "KF5DesignerPlugin, -S${bindir}, -S${STAGING_BINDIR_NATIVE}"
 
 FILES_${PN} += "${libdir}/plugins/designer"
 FILES_${PN}-dbg += "${libdir}/plugins/designer/.debug"
diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
index 0df3438b..a381a4a1 100644
--- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb
+++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
@@ -18,7 +18,7 @@ SRC_URI[md5sum] = "b47ba38043952502127431910d920b50"
 SRC_URI[sha256sum] = "7bec16bab7a272cd7714fc5b9d7d54a1dfa618985553bbd0244941b6c6839d2f"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Su, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Su, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Su, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Su, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN}-dbg += "${libdir}/kdesu/kf5/.debug"
diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
index 7340cf1f..79165170 100644
--- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
+++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb
@@ -22,5 +22,5 @@ SRC_URI[md5sum] = "7e2bd16d3b35d75e1a21226af2257048"
 SRC_URI[sha256sum] = "b9a00448f7a6129bd713e02633c0baeb8e1cd84ece599f9ebf0a24c356d558c0"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5WebKit, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5WebKit, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5WebKit, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5WebKit, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
index 7be0ffd3..9ea5b7f6 100644
--- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
+++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb
@@ -14,8 +14,8 @@ SRC_URI[md5sum] = "76d2095cb438ce97d740a043aeb4c159"
 SRC_URI[sha256sum] = "1296e79a454fa7a626c65f6156cc80a955d7d3c4662a1e4ec2e8bd942a97fdb0"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Emoticons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Emoticons, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Emoticons, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Emoticons, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/emoticons ${datadir}/k*5"
 FILES_${PN}-dbg += "${libdir}/plugins/kf5/*/.debug"
diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
index 55f0b1ea..17aaa130 100644
--- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
+++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
@@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "a47ace37aea45a9ea39f04d136b950f977ca9905beb9ade48b56e0f653
 SRC_URI += "file://0001-HACK-Add-a-stub-runtime-implementation-to-enable-bui.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5GlobalAccel, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5GlobalAccel, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5GlobalAccel, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5GlobalAccel, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservices5"
diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
index 1525f1ef..26c1111b 100644
--- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
+++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb
@@ -13,5 +13,5 @@ SRC_URI[md5sum] = "bebd631369a52c8ce3b168f033688a8d"
 SRC_URI[sha256sum] = "60e5c34a16af7c4bb67785756e301de765604b518bddb3adb4765ac75f9fa92a"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5IconThemes, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5IconThemes, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5IconThemes, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5IconThemes, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb
index 123dccc3..844a4734 100644
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -31,8 +31,8 @@ PACKAGECONFIG[full] = "-DKIOCORE_ONLY=OFF,-DKIOCORE_ONLY=ON, kbookmarks kcomplet
 PACKAGECONFIG ??= "full"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5KIO, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5KIO, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5KIO, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5KIO, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/plugins"
 FILES_${PN}-dbg += "${libdir}/plugins/.debug ${libdir}/${BPN}/kf5/.debug ${libdir}/plugins/kf5/*/.debug"
diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
index 5b60f025..6a047342 100644
--- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
+++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb
@@ -26,5 +26,5 @@ SRC_URI[md5sum] = "74d99cdfe7c8c018966c3dec93c81cea"
 SRC_URI[sha256sum] = "0846b5ef99ea50f431ae4439865a2eb66c04e0cb62d60f4fdfeb2ab58e8a5d5e"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5NewStuff, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5NewStuff, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5NewStuff, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5NewStuff, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/knotifications/knotifications.bb b/recipes-kde/kf5/tier3/knotifications/knotifications.bb
index 75000b88..94e70185 100644
--- a/recipes-kde/kf5/tier3/knotifications/knotifications.bb
+++ b/recipes-kde/kf5/tier3/knotifications/knotifications.bb
@@ -15,7 +15,7 @@ SRC_URI[md5sum] = "cdcded8f150246437eced2ce5fface2f"
 SRC_URI[sha256sum] = "78df80e45900840e31bea30c38706358612bdcfb8d5150e518d91e9c2fe69b1b"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Notifications, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Notifications, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Notifications, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservicetypes5"
diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
index 93da1767..98587084 100644
--- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
+++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb
@@ -24,5 +24,5 @@ SRC_URI[md5sum] = "08bfc1548b69a6bdd491e9aac17ec7e6"
 SRC_URI[sha256sum] = "759bca50921bf2a9467d55d65508c18ce9b2d348de416ab42fedc91a4466fdc4"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5NotifyConfig, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5NotifyConfig, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5NotifyConfig, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5NotifyConfig, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb
index 09b8bf2b..4b0bf5f4 100644
--- a/recipes-kde/kf5/tier3/kparts/kparts.bb
+++ b/recipes-kde/kf5/tier3/kparts/kparts.bb
@@ -25,8 +25,8 @@ SRC_URI[md5sum] = "354a43983d5d66fe795808d48527daad"
 SRC_URI[sha256sum] = "6291872e24f45b093eb1a08b771fde6206538905d7a363b2ce22c8d4d1cf3801"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Parts, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Parts, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Parts, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Parts, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/k*5 ${libdir}/plugins"
 FILES_${PN}-dbg += "${libdir}/plugins/.debug"
diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
index 2f32b634..f1d50abf 100644
--- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb
+++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb
@@ -13,8 +13,8 @@ SRC_URI[md5sum] = "5effd861add4d39d0bd3756b17fa814c"
 SRC_URI[sha256sum] = "0516f8df4992bdae2ff57425bfce84e14d45635cc6697b11a9111ed8b5e2a2c5"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5People, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5People, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5People, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5People, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb
index 67ac55a4..98caa87c 100644
--- a/recipes-kde/kf5/tier3/kservice/kservice.bb
+++ b/recipes-kde/kf5/tier3/kservice/kservice.bb
@@ -14,8 +14,8 @@ PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "3cdd6ab50bc6e775bfc12da912fdbbca"
 SRC_URI[sha256sum] = "e87bb8885f852897a8d4de29e00d0bb2d6bbe6a42804faf03359aed309dc64ca"
 
-CMAKE_HIDE_ERROR[1] = "KF5Service, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Service, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Service, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Service, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/kservicetypes5"
 
diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
index 33c3a502..1a2d0a3f 100644
--- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
+++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb
@@ -5,8 +5,8 @@ inherit cmake-lib
 DEPENDS += "${BPN}-native qtxmlpatterns"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5TextEditor, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5TextEditor, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5TextEditor, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5TextEditor, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/k*5"
 FILES_${PN}-dbg += "${libdir}/plugins/kf5/parts/.debug"
diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
index 8c86805b..2b542dc1 100644
--- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
+++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "b033eacbea5aafc024302fc847bf3f53"
 SRC_URI[sha256sum] = "9bd528d8ed3feec1d18f4449e8649506c8c5d8c83915b51ccdb6856b1d7e5115"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5TextWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5TextWidgets, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5TextWidgets, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5TextWidgets, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}/kservicetypes5"
diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb
index f0128cfb..ea09de40 100644
--- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb
+++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb
@@ -29,7 +29,7 @@ SRC_URI[sha256sum] = "c8cb635a9f58c996679dffeec47be8b0a9ff9627c31ae411f6543183a0
 SRC_URI += "file://0001-add-NO_CMAKE_FIND_ROOT_PATH-in-find-to-org.kde.KWall.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Wallet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Wallet, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Wallet, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Wallet, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir}"
diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
index e435fffa..aea8963d 100644
--- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
+++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb
@@ -33,8 +33,8 @@ SRC_URI += " \
 EXTRA_OECMAKE += "-DBUILD_TESTING=OFF"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5XmlGui, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5XmlGui, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5XmlGui, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5XmlGui, -S${includedir}, -S${STAGING_INCDIR}"
 
 # evt. put ksendbugmail to separate package later
 FILES_${PN}-dbg += "${libdir}/kxmlgui/kf5/.debug/"
diff --git a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb
index fad95df0..d64bedb3 100644
--- a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb
+++ b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "0603953cd62226ee9e3f034419bb88e5"
 SRC_URI[sha256sum] = "832bb858a45d8a9461870c90d449bd3463ac17c51fd1111a824880b829fab475"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5XmlRpcClient, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5XmlRpcClient, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5XmlRpcClient, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5XmlRpcClient, -S${includedir}, -S${STAGING_INCDIR}"
 
 
diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
index 6a6ae85f..eb43ce8f 100644
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -35,8 +35,8 @@ SRC_URI[md5sum] = "4e8388cee55215412db36c226f4b3b2c"
 SRC_URI[sha256sum] = "027544d49d3da11d8b16ac0caa3007fbb27d5a64d4ba02f113a6376282758280"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Plasma, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Plasma, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Plasma, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Plasma, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/k*5 \
diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
index 2376a7e5..752025e4 100644
--- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
+++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb
@@ -23,8 +23,8 @@ SRC_URI[md5sum] = "5e833c39103910c01d851db6dddffffc"
 SRC_URI[sha256sum] = "6ee0c7dbfa1e63cc470a1d32805e6c726aa9a54d5d776ec81e20787eb4b34b87"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5FrameworkIntegration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5FrameworkIntegration, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5FrameworkIntegration, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5FrameworkIntegration, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += " \
     ${datadir}/knotifications5 \
diff --git a/recipes-kde/other/phonon/phonon_4.8.3.bb b/recipes-kde/other/phonon/phonon_4.8.3.bb
index 928ea5cf..b8a875dd 100644
--- a/recipes-kde/other/phonon/phonon_4.8.3.bb
+++ b/recipes-kde/other/phonon/phonon_4.8.3.bb
@@ -27,8 +27,8 @@ do_install_append() {
 }
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "phonon4qt5, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "phonon4qt5, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "phonon4qt5, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "phonon4qt5, -S${includedir}, -S${STAGING_INCDIR}"
 
 PACKAGES =+ "${PN}-designer-plugin-dbg ${PN}-designer-plugin"
 FILES_${PN}-designer-plugin = "${libdir}/qt5/plugins/designer"
diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
index 7c1df9dd..53ab9ace 100644
--- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
+++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb
@@ -10,5 +10,5 @@ SRC_URI = "http://download.kde.org/stable/apps/KDE4.x/admin/${BPN}-${PV}.tar.bz2
 SRC_URI[md5sum] = "bee71b71c12797e6fc498540a06c829b"
 SRC_URI[sha256sum] = "67fb03bf6ca3e0bdbd98d374dfb5b1651a07d17ae6c23e11a81b4b084447e7c6"
 
-CMAKE_HIDE_ERROR[1] = "PolkitQt5-1, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "PolkitQt5-1, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "PolkitQt5-1, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "PolkitQt5-1, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
index cc83a78d..c442667e 100644
--- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
+++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb
@@ -9,5 +9,5 @@ SRC_URI[md5sum] = "098d15b2963526b2d5c5178bc4298fa0"
 SRC_URI[sha256sum] = "9eb9a1b155c525121816d7fb06193971c5cafb5a414a3d82b86a7562e0832024"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KDecoration2, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KDecoration2, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KDecoration2, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
index 958ad060..df4b420c 100644
--- a/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
+++ b/recipes-kde/plasma/tier2/kfilemetadata/kfilemetadata.bb
@@ -20,7 +20,7 @@ DEPENDS += "libav ki18n karchive poppler"
 DEPENDS += "taglib"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5FileMetaData, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5FileMetaData, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5FileMetaData, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5FileMetaData, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN}-dbg += "${libdir}/plugins/kf5/kfilemetadata/.debug"
diff --git a/recipes-kde/plasma/tier3/baloo/baloo.bb b/recipes-kde/plasma/tier3/baloo/baloo.bb
index f0dfdfb3..a8369423 100644
--- a/recipes-kde/plasma/tier3/baloo/baloo.bb
+++ b/recipes-kde/plasma/tier3/baloo/baloo.bb
@@ -16,8 +16,8 @@ SRC_URI[sha256sum] = "c2e1b6bf3c2ad830fde63c863fa1b792272cca2986a5145b490ba63ef1
 SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Baloo, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Baloo, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir} \
 	${libdir}/qml/org/kde/baloo \
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 114c0f05..a2e56273 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -66,10 +66,10 @@ SRC_URI += " \
 # 0007 taskmanager stub either X11 or wayland
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[3] = "LibTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "LibKWorkspace, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "LibKWorkspace, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[3] = "LibTaskManager, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[4] = "LibTaskManager, -S${includedir}, -S${STAGING_INCDIR}"
 
 # REVISIT
 FILES_${PN} += " \
diff --git a/recipes-kde/plasma/untier/kwayland/kwayland.bb b/recipes-kde/plasma/untier/kwayland/kwayland.bb
index 70eabbc0..2293fece 100644
--- a/recipes-kde/plasma/untier/kwayland/kwayland.bb
+++ b/recipes-kde/plasma/untier/kwayland/kwayland.bb
@@ -20,8 +20,8 @@ PV = "5.1.90+git${SRCPV}"
 
 DEPENDS += "wayland wayland-native"
 
-CMAKE_HIDE_ERROR[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5Wayland, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Wayland, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Wayland, -S${includedir}, -S${STAGING_INCDIR}"
 
 
 
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 84e900e8..355030e2 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -26,6 +26,6 @@ FILES_${PN}-dbg += " \
     ${libexecdir}/kf5/.debug \
 "
 
-CMAKE_HIDE_ERROR[1] = "KF5Screen, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "KF5Screen, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5Screen, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "KF5Screen, -S${libdir}, -S${STAGING_LIBDIR}"
 
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index 386ee544..16abbec4 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -29,8 +29,8 @@ SRC_URI[md5sum] = "66a24b5e0dd7ced08d57b52255da7beb"
 SRC_URI[sha256sum] = "4239c66da50c2bca7465a7e2842421aaff5c12a56dcebd1cd3fbede6141c1a38"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "KF5SysGuard, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5SysGuard, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "KF5SysGuard, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN} += "${datadir} ${libdir}/kauth"
 FILES_${PN}-dbg += "${libdir}/kauth/.debug"
diff --git a/recipes-kde/plasma/untier/libmm-qt/libmm-qt.bb b/recipes-kde/plasma/untier/libmm-qt/libmm-qt.bb
index ee6c8b50..89b12d0d 100644
--- a/recipes-kde/plasma/untier/libmm-qt/libmm-qt.bb
+++ b/recipes-kde/plasma/untier/libmm-qt/libmm-qt.bb
@@ -14,6 +14,6 @@ DEPENDS += " \
     modemmanager \
 "
 
-CMAKE_HIDE_ERROR[1] = "KF5ModemManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "KF5ModemManagerQt, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "KF5ModemManagerQt, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "KF5ModemManagerQt, -S${libdir}, -S${STAGING_LIBDIR}"
 
diff --git a/recipes-lxqt/liblxqt-mount/liblxqt-mount_git.bb b/recipes-lxqt/liblxqt-mount/liblxqt-mount_git.bb
index cca8a217..77596d56 100644
--- a/recipes-lxqt/liblxqt-mount/liblxqt-mount_git.bb
+++ b/recipes-lxqt/liblxqt-mount/liblxqt-mount_git.bb
@@ -7,4 +7,4 @@ inherit lxqt cmake-lib
 SRCREV = "1c8422bd78dfb06b631568b1780ec5f59682cbdc"
 PV = "0.9.0"
 
-CMAKE_HIDE_ERROR[1] = "lxqtmount, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "lxqtmount, -S${includedir}, -S${STAGING_INCDIR}"
diff --git a/recipes-lxqt/liblxqt/liblxqt_git.bb b/recipes-lxqt/liblxqt/liblxqt_git.bb
index fbe341bb..1701b4c9 100644
--- a/recipes-lxqt/liblxqt/liblxqt_git.bb
+++ b/recipes-lxqt/liblxqt/liblxqt_git.bb
@@ -11,6 +11,6 @@ PV = "0.9.0"
 
 EXTRA_OECMAKE += "-DCMAKE_INSTALL_DATAROOTDIR=share -DLXQT_ETC_XDG_DIR=${sysconfdir}/xdg"
 
-CMAKE_HIDE_ERROR[1] = "lxqt, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "lxqt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[3] = "lxqt, -S${datadir}/cmake, -S${STAGING_DATADIR}/cmake"
+CMAKE_ALIGN_SYSROOT[1] = "lxqt, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "lxqt, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[3] = "lxqt, -S${datadir}/cmake, -S${STAGING_DATADIR}/cmake"
diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb
index 4d8142d1..07abdacc 100644
--- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb
+++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb
@@ -12,5 +12,5 @@ PV = "1.1.0"
 
 EXTRA_OECMAKE += "-DCMAKE_INSTALL_PREFIX=''"
 
-CMAKE_HIDE_ERROR[1] = "qt5xdg, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "qt5xdg, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "qt5xdg, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "qt5xdg, -S${libdir}, -S${STAGING_LIBDIR}"
diff --git a/recipes-lxqt/libsysstat/libsysstat_git.bb b/recipes-lxqt/libsysstat/libsysstat_git.bb
index dfd9c841..2c85fe16 100644
--- a/recipes-lxqt/libsysstat/libsysstat_git.bb
+++ b/recipes-lxqt/libsysstat/libsysstat_git.bb
@@ -7,5 +7,5 @@ inherit lxqt cmake-lib
 SRCREV = "70f70eb97e5b144a63468ea78b6c436bf43cf571"
 PV = "0.3.0"
 
-CMAKE_HIDE_ERROR[1] = "sysstat-qt5, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "sysstat-qt5, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "sysstat-qt5, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "sysstat-qt5, -S${libdir}, -S${STAGING_LIBDIR}"
diff --git a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
index 2748f416..294e3ea6 100644
--- a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
+++ b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "liblxqt"
 SRCREV = "4504880ff4c960a7cf1e971128c415390109feed"
 PV = "0.9.0"
 
-CMAKE_HIDE_ERROR[1] = "lxqt-globalkeys, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[2] = "lxqt-globalkeys, -S${libdir}, -S${STAGING_LIBDIR}"
-CMAKE_HIDE_ERROR[3] = "lxqt-globalkeys-ui, -S${includedir}, -S${STAGING_INCDIR}"
-CMAKE_HIDE_ERROR[4] = "lxqt-globalkeys-ui, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "lxqt-globalkeys, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[2] = "lxqt-globalkeys, -S${libdir}, -S${STAGING_LIBDIR}"
+CMAKE_ALIGN_SYSROOT[3] = "lxqt-globalkeys-ui, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[4] = "lxqt-globalkeys-ui, -S${libdir}, -S${STAGING_LIBDIR}"
diff --git a/recipes-support/xapian/xapian-core_1.2.19.bb b/recipes-support/xapian/xapian-core_1.2.19.bb
index 2ae62b00..ac7da4e4 100644
--- a/recipes-support/xapian/xapian-core_1.2.19.bb
+++ b/recipes-support/xapian/xapian-core_1.2.19.bb
@@ -12,7 +12,7 @@ inherit autotools cmake-lib
 DEPENDS = "util-linux zlib"
 
 # cross libs / headers
-CMAKE_HIDE_ERROR[1] = "xapian, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
-CMAKE_HIDE_ERROR[2] = "xapian, -S${includedir}, -S${STAGING_INCDIR}"
+CMAKE_ALIGN_SYSROOT[1] = "xapian, -S${libdir}/lib, -S${STAGING_LIBDIR}/lib"
+CMAKE_ALIGN_SYSROOT[2] = "xapian, -S${includedir}, -S${STAGING_INCDIR}"
 
 FILES_${PN}-dev += "${libdir}/cmake"