Differential D15795 Diff 42421 kde-modules/KDEInstallDirs.cmake

Changeset View

Standalone View

View Options

kde-modules/KDEInstallDirs.cmake

Context not available.
428 428​
429_define_absolute(EXECROOTDIR "" 429​_define_absolute(EXECROOTDIR ""
430 "executables and libraries" 430​ "executables and libraries"
431 EXEC_INSTALL_PREFIX) 431​ KDE_INSTALL_EXECROOTDIR)
432 432​
433_define_relative(BINDIR EXECROOTDIR "bin" 433​_define_relative(BINDIR EXECROOTDIR "bin"
434 "user executables" 434​ "user executables"
435 BIN_INSTALL_DIR) 435​ KDE_INSTALL_BINDIR)
436_define_relative(SBINDIR EXECROOTDIR "sbin" 436​_define_relative(SBINDIR EXECROOTDIR "sbin"
437 "system admin executables" 437​ "system admin executables"
438 SBIN_INSTALL_DIR) 438​ KDE_INSTALL_SBINDIR)
439_define_relative(LIBDIR EXECROOTDIR "${_LIBDIR_DEFAULT}" 439​_define_relative(LIBDIR EXECROOTDIR "${_LIBDIR_DEFAULT}"
440 "object code libraries" 440​ "object code libraries"
441 LIB_INSTALL_DIR) 441​ KDE_INSTALL_LIBDIR)
442 442​
443if(WIN32) 443​if(WIN32)
444 _define_relative(LIBEXECDIR BINDIR "" 444​ _define_relative(LIBEXECDIR BINDIR ""
445 "executables for internal use by programs and libraries" 445​ "executables for internal use by programs and libraries"
446 LIBEXEC_INSTALL_DIR) 446​ KDE_INSTALL_LIBEXECDIR)
447 _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}") 447​ _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}")
448else() 448​else()
449 _define_relative(LIBEXECDIR LIBDIR "libexec" 449​ _define_relative(LIBEXECDIR LIBDIR "libexec"
450 "executables for internal use by programs and libraries" 450​ "executables for internal use by programs and libraries"
451 LIBEXEC_INSTALL_DIR) 451​ KDE_INSTALL_LIBEXECDIR)
452 _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}/kf5") 452​ _define_non_cache(LIBEXECDIR_KF5 "${CMAKE_INSTALL_LIBEXECDIR}/kf5")
453endif() 453​endif()
454if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) 454​if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
Context not available.
514 514​
515_define_absolute(INCLUDEDIR "include" 515​_define_absolute(INCLUDEDIR "include"
516 "C and C++ header files" 516​ "C and C++ header files"
517 INCLUDE_INSTALL_DIR) 517​ KDE_INSTALL_INCLUDEDIR)
518_define_non_cache(INCLUDEDIR_KF5 "${CMAKE_INSTALL_INCLUDEDIR}/KF5") 518​_define_non_cache(INCLUDEDIR_KF5 "${CMAKE_INSTALL_INCLUDEDIR}/KF5")
519if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) 519​if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
520 set(KF5_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR_KF5}") 520​ set(KF5_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR_KF5}")
Context not available.
531if (WIN32) 531​if (WIN32)
532 _define_relative(DATAROOTDIR BINDIR "data" 532​ _define_relative(DATAROOTDIR BINDIR "data"
533 "read-only architecture-independent data root" 533​ "read-only architecture-independent data root"
534 SHARE_INSTALL_PREFIX) 534​ KDE_INSTALL_DATAROOTDIR)
535else() 535​else()
536 _define_absolute(DATAROOTDIR "share" 536​ _define_absolute(DATAROOTDIR "share"
537 "read-only architecture-independent data root" 537​ "read-only architecture-independent data root"
538 SHARE_INSTALL_PREFIX) 538​ KDE_INSTALL_DATAROOTDIR)
539endif() 539​endif()
540 540​
541_define_relative(DATADIR DATAROOTDIR "" 541​_define_relative(DATADIR DATAROOTDIR ""
542 "read-only architecture-independent data" 542​ "read-only architecture-independent data"
543 DATA_INSTALL_DIR) 543​ KDE_INSTALL_DATADIR)
544_define_non_cache(DATADIR_KF5 "${CMAKE_INSTALL_DATADIR}/kf5") 544​_define_non_cache(DATADIR_KF5 "${CMAKE_INSTALL_DATADIR}/kf5")
545if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) 545​if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED)
546 set(KF5_DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR_KF5}") 546​ set(KF5_DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR_KF5}")
Context not available.
561# KDE Framework-specific things 561​# KDE Framework-specific things
562_define_relative(DOCBUNDLEDIR DATAROOTDIR "doc/HTML" 562​_define_relative(DOCBUNDLEDIR DATAROOTDIR "doc/HTML"
563 "documentation bundles generated using kdoctools" 563​ "documentation bundles generated using kdoctools"
564 HTML_INSTALL_DIR) 564​ KDE_INSTALL_DOCBUNDLEDIR)
ltoscanoUnsubmitted
Not Done

I'm going to comment only on this, but the others (most, if not all) are the same. If you check the definition of _define_relative, this parameter is:

oldstylename (optional): the old-style name of the variable

So this command is exactly defining the old variable in addition to the new one.
We can't remove the definition of the old variables until they are in use, and for sure not during the lifetime of Frameworks 5.x.

Unless of course I misunderstood the code...

ltoscano: I'm going to comment only on this, but the others (most, if not all) are the same. If you check…
dinohAuthorUnsubmitted
Not Done

Hmm, you're right, but then it shouldn't come up with a warning...?

In the _define_relative macro we have:

if(KDE_INSTALL_${varname})
    ...
elseif(${_oldstylename})
    if(NOT CMAKE_VERSION VERSION_LESS 3.0.0)
        message(DEPRECATION "${_oldstylename} is deprecated, use KDE_INSTALL_${varname} instead.")

In my case the message was triggered for all definitions.

dinoh: Hmm, you're right, but then it shouldn't come up with a warning...? In the _define_relative…
565_define_relative(KCFGDIR DATAROOTDIR "config.kcfg" 565​_define_relative(KCFGDIR DATAROOTDIR "config.kcfg"
566 "kconfig description files" 566​ "kconfig description files"
567 KCFG_INSTALL_DIR) 567​ KCFG_INSTALL_DIR)
Context not available.
586# Cross-desktop or other system things 586​# Cross-desktop or other system things
587_define_relative(ICONDIR DATAROOTDIR "icons" 587​_define_relative(ICONDIR DATAROOTDIR "icons"
588 "icons" 588​ "icons"
589 ICON_INSTALL_DIR) 589​ KDE_INSTALL_ICONDIR)
590_define_relative(LOCALEDIR DATAROOTDIR "locale" 590​_define_relative(LOCALEDIR DATAROOTDIR "locale"
591 "knotify description files" 591​ "knotify description files"
592 LOCALE_INSTALL_DIR) 592​ KDE_INSTALL_LOCALEDIR)
593_define_relative(SOUNDDIR DATAROOTDIR "sounds" 593​_define_relative(SOUNDDIR DATAROOTDIR "sounds"
594 "sound files" 594​ "sound files"
595 SOUND_INSTALL_DIR) 595​ KDE_INSTALL_SOUNDDIR)
596_define_relative(TEMPLATEDIR DATAROOTDIR "templates" 596​_define_relative(TEMPLATEDIR DATAROOTDIR "templates"
597 "templates" 597​ "templates"
598 TEMPLATES_INSTALL_DIR) 598​ TEMPLATES_INSTALL_DIR)
Context not available.
614 "documentation bundles in QCH format") 614​ "documentation bundles in QCH format")
615_define_relative(MANDIR DATAROOTDIR "man" 615​_define_relative(MANDIR DATAROOTDIR "man"
616 "man documentation" 616​ "man documentation"
617 MAN_INSTALL_DIR) 617​ KDE_INSTALL_MANDIR)
618_define_relative(INFODIR DATAROOTDIR "info" 618​_define_relative(INFODIR DATAROOTDIR "info"
619 "info documentation") 619​ "info documentation")
620_define_relative(DBUSDIR DATAROOTDIR "dbus-1" 620​_define_relative(DBUSDIR DATAROOTDIR "dbus-1"
Context not available.
640 640​
641_define_absolute(SYSCONFDIR "${_default_sysconf_dir}" 641​_define_absolute(SYSCONFDIR "${_default_sysconf_dir}"
642 "read-only single-machine data" 642​ "read-only single-machine data"
643 SYSCONF_INSTALL_DIR) 643​ KDE_INSTALL_SYSCONFDIR)
644_define_relative(CONFDIR SYSCONFDIR "xdg" 644​_define_relative(CONFDIR SYSCONFDIR "xdg"
645 "application configuration files" 645​ "application configuration files"
646 CONFIG_INSTALL_DIR) 646​ CONFIG_INSTALL_DIR)
Context not available.