D26956: Remove export header from static install
This revision was not accepted when it landed; it landed in state "Needs Review". This revision was automatically updated to reflect the committed changes. Closed by commit R169:0aa162f2e838: Remove export header from static install (authored by masonm, committed by jbbgameich). REPOSITORY R169 Kirigami CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D26956?vs=74470&id=78202 REVISION DETAIL https://phabricator.kde.org/D26956 AFFECTED FILES src/libkirigami/CMakeLists.txt To: masonm, #kirigami, mart, apol Cc: jbbgameich, plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart
D26956: Remove export header from static install
jbbgameich added a comment. @apol is your question answered now / can I land this? REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 To: masonm, #kirigami, mart, apol Cc: jbbgameich, plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart
D26956: Remove export header from static install
masonm requested review of this revision. masonm added a comment. Hello, Just following up on this change review—it all looks good to me. Can we merge it in? Thanks! REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 To: masonm, #kirigami, mart, apol Cc: plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart
D26956: Remove export header from static install
masonm added a comment. It appears all the sources which reference the export header have an appropriate guard on them: #ifndef KIRIGAMI_BUILD_TYPE_STATIC #include #endif I found these in tabletmodewatcher.h, kirigamipluginfactory.h, platformtheme.h REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 To: masonm, #kirigami, mart, apol Cc: plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart, hein
D26956: Remove export header from static install
masonm added a comment. Ah, I'll take a closer look. REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 To: masonm, #kirigami, mart, apol Cc: plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart, hein
D26956: Remove export header from static install
apol requested changes to this revision. apol added a comment. This revision now requires changes to proceed. Wait no, are you sure? kirigami headers will still include the file... REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 To: masonm, #kirigami, mart, apol Cc: plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart, hein
D26956: Remove export header from static install
masonm created this revision. masonm added a reviewer: VDG. masonm added a project: Kirigami. Herald added a subscriber: plasma-devel. masonm requested review of this revision. REVISION SUMMARY When building the "install" target with a static Kirigami build an error occurs due to the missing file kirigami2_export.h. TEST PLAN Download Kirigami sources, create build directory, create install directory, and then something similar to: INSTALL_DIR=$HOME/tmp-install QT_INSTALL_DIR=$HOME/qt-5.12.6 ECM_DIR=$HOME/tmp-install # Assume ECM was also "make installed" into this dir KIRIGAMI_SRC=$HOME/kirigami cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$QT_INSTALL_DIR;$ECM_DIR $KIRIGAMI_SRC cmake --build . --target install Before the patch this will fail because of missing kirigami2_export.h file. REPOSITORY R169 Kirigami REVISION DETAIL https://phabricator.kde.org/D26956 AFFECTED FILES src/libkirigami/CMakeLists.txt To: masonm, #vdg Cc: plasma-devel, fbampaloukas, GB_2, domson, dkardarakos, ngraham, apol, ahiemstra, davidedmundson, mart, hein