D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Piotr Wójcik]

pwojcik added a comment.


  I want to remind about topic.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D26245

To: pwojcik, kossebau, alexmerry
Cc: apol, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns

D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Piotr Wójcik]

pwojcik updated this revision to Diff 72404.
pwojcik added a comment.


  Corrected logic, so it is is in line with GNUInstallDirs. Explained in 
comment. Added tests.

REPOSITORY
  R240 Extra CMake Modules

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D26245?vs=72258=72404

REVISION DETAIL
  https://phabricator.kde.org/D26245

AFFECTED FILES
  kde-modules/KDEInstallDirs.cmake
  tests/CMakeLists.txt
  tests/KDEInstallDirsTest/vars_in_sync/CMakeLists.txt

To: pwojcik, kossebau, alexmerry
Cc: apol, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns

D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Friedrich W. H. Kossebau]

kossebau added a comment.


  (Just remember that using KDE_INSTALL_KNSRCDIR though needs at least 
KNewStuffCore from KF 5.57 (hint was missing in API dox, proposing D26248 
 to fix that).)
  
  Myself also need to reserve time to look closer at it, hoping to sneak in in 
the next days or week 1 of 2020
  
  Please see to add a unit test also covering this, so this special case is 
covered.

INLINE COMMENTS

> pwojcik wrote in KDEInstallDirs.cmake:376
> /usr is single special case, but any subdirectory of /opt/ is special by 
> GNUInstallDirs.cmake, following Filesystem Hierarchy Standard.

Ideally gets a small explaining comment in the code, as this is not directly 
obvious.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D26245

To: pwojcik, kossebau, alexmerry
Cc: apol, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns

D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Piotr Wójcik]

pwojcik added inline comments.

INLINE COMMENTS

> apol wrote in KDEInstallDirs.cmake:376
> Why's /opt special?

/usr is single special case, but any subdirectory of /opt/ is special by 
GNUInstallDirs.cmake, following Filesystem Hierarchy Standard.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D26245

To: pwojcik, kossebau, alexmerry
Cc: apol, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns

D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Aleix Pol Gonzalez]

apol added a comment.


  Not saying that this patch is wrong, would have to look into it more closely.
  
  But for knsrc files you want to use KDE_INSTALL_KNSRCDIR anyway, which will 
fall into /usr.

INLINE COMMENTS

> KDEInstallDirs.cmake:376
> +list(FIND _gnu_install_special_vars "${varname}" _vars_list_offset)
> +if ((NOT _prefix_list_offset EQUAL -1 OR CMAKE_INSTALL_PREFIX 
> MATCHES "^/opt/") AND NOT _vars_list_offset EQUAL -1)
> +set(KDE_INSTALL_${varname} "${CMAKE_INSTALL_FULL_${varname}}"

Why's /opt special?

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D26245

To: pwojcik, kossebau, alexmerry
Cc: apol, kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns

D26245: Set SYSCONFDIR to /etc when CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr

[Piotr Wójcik]

pwojcik retitled this revision from "Set SYSCONFDIR to /etc when 
CMAKE_INSTALL_PREFIX is /usr AND " to "Set SYSCONFDIR to /etc when 
CMAKE_INSTALL_SYSCONFDIR is etc relative to /usr".
pwojcik edited the summary of this revision.
pwojcik added reviewers: kossebau, alexmerry.

REPOSITORY
  R240 Extra CMake Modules

REVISION DETAIL
  https://phabricator.kde.org/D26245

To: pwojcik, kossebau, alexmerry
Cc: kde-frameworks-devel, kde-buildsystem, LeGast00n, GB_2, bencreasy, 
michaelh, ngraham, bruns