Use non-deprecated ECM KDEInstallDirs variables

parent c0316f41
......@@ -124,8 +124,8 @@ set( OKTETALIBS_MINOR_VERSION 9 )
set( OKTETALIBS_PATCHLEVEL_VERSION 1 )
set( OKTETALIBS_VERSION "${OKTETALIBS_MAJOR_VERSION}.${OKTETALIBS_MINOR_VERSION}.${OKTETALIBS_PATCHLEVEL_VERSION}" )
set( OKTETALIBS_ABI_VERSION 2 )
set( OKTETALIBS_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/okteta ) #${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_CCINCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/Okteta ) #${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/okteta ) #${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_CCINCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/Okteta ) #${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_LIB_SOVERSION ${OKTETALIBS_ABI_VERSION} )
set( OKTETALIBS_LIB_VERSION ${OKTETALIBS_VERSION} )
......
......@@ -126,7 +126,7 @@ set_target_properties( OktetaCore PROPERTIES
SOVERSION ${OKTETACORE_SOVERSION}
)
install( TARGETS OktetaCore EXPORT OktetaCoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaCore EXPORT OktetaCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES
${oktetacore_LIB_HDRS}
......@@ -140,7 +140,7 @@ install( FILES ${oktetacore_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OktetaCore")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/OktetaCore")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/OktetaCoreConfig.cmake.in"
......
......@@ -23,7 +23,7 @@ target_include_directories( oktetadesignerplugin
${Qt5Designer_INCLUDE_DIRS}
)
install( TARGETS oktetadesignerplugin DESTINATION ${QT_PLUGIN_INSTALL_DIR}/designer )
install( TARGETS oktetadesignerplugin DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer )
if( OKTETA_BUILD_EXAMPLES )
......
kdoctools_create_handbook( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR okteta)
kdoctools_create_handbook( index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR okteta)
......@@ -144,7 +144,7 @@ set_target_properties( OktetaGui PROPERTIES
SOVERSION ${OKTETAGUI_SOVERSION}
)
install( TARGETS OktetaGui EXPORT OktetaGuiTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaGui EXPORT OktetaGuiTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${oktetagui_LIB_HDRS}
DESTINATION ${OKTETALIBS_INCLUDE_INSTALL_DIR}
......@@ -156,7 +156,7 @@ install( FILES ${oktetagui_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OktetaGui")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/OktetaGui")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/OktetaGuiConfig.cmake.in"
......
......@@ -6,8 +6,8 @@ set( OKTETAKASTEN_MINOR_VERSION 3 )
set( OKTETAKASTEN_PATCHLEVEL_VERSION 1 )
set( OKTETAKASTEN_VERSION "${OKTETAKASTEN_MAJOR_VERSION}.${OKTETAKASTEN_MINOR_VERSION}.${OKTETAKASTEN_PATCHLEVEL_VERSION}" )
set( OKTETAKASTEN_ABI_VERSION 1 )
set( OKTETAKASTEN_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kasten/okteta ) #${KASTEN_ABI_VERSION}/okteta${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_CCINCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/Kasten/Okteta ) #${KASTEN_ABI_VERSION}/Okteta${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/kasten/okteta ) #${KASTEN_ABI_VERSION}/okteta${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_CCINCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/Kasten/Okteta ) #${KASTEN_ABI_VERSION}/Okteta${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_LIB_SOVERSION ${OKTETAKASTEN_ABI_VERSION} )
set( OKTETAKASTEN_LIB_VERSION ${OKTETAKASTEN_VERSION} )
......
......@@ -664,7 +664,7 @@ set_target_properties( OktetaKastenControllers PROPERTIES
SOVERSION ${OKTETAKASTENCONTROLLERS_SOVERSION}
)
install( TARGETS OktetaKastenControllers EXPORT OktetaKastenControllersTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaKastenControllers EXPORT OktetaKastenControllersTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${okteta_kastencontrollers_LIB_HDRS}
DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
......@@ -674,28 +674,28 @@ install( FILES ${okteta_kastencontrollers_LIB_CCHDRS}
DESTINATION ${OKTETAKASTEN_CCINCLUDE_INSTALL_DIR}
COMPONENT Devel
)
install( FILES view/structures/kns/okteta-structures.knsrc DESTINATION ${CONFIG_INSTALL_DIR} )
install( FILES view/structures/kns/okteta-structures.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
set( elf_structure_FILES
view/structures/examples/okteta/structures/elf/metadata.desktop
view/structures/examples/okteta/structures/elf/main.osd
)
install( FILES ${elf_structure_FILES} DESTINATION ${DATA_INSTALL_DIR}/okteta/structures/elf )
install( FILES ${elf_structure_FILES} DESTINATION ${KDE_INSTALL_DATADIR}/okteta/structures/elf )
set( png_structure_FILES
view/structures/examples/okteta/structures/png/metadata.desktop
view/structures/examples/okteta/structures/png/main.osd
)
install( FILES ${png_structure_FILES} DESTINATION ${DATA_INSTALL_DIR}/okteta/structures/png )
install( FILES view/structures/examples/okteta/structures/uuid.js DESTINATION ${DATA_INSTALL_DIR}/okteta/structures/ )
install( FILES view/structures/settings/structviewpreferences.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES ${png_structure_FILES} DESTINATION ${KDE_INSTALL_DATADIR}/okteta/structures/png )
install( FILES view/structures/examples/okteta/structures/uuid.js DESTINATION ${KDE_INSTALL_DATADIR}/okteta/structures/ )
install( FILES view/structures/settings/structviewpreferences.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
configure_file( view/structures/struct2osd.in ${CMAKE_CURRENT_BINARY_DIR}/struct2osd @ONLY )
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/struct2osd DESTINATION ${BIN_INSTALL_DIR} )
install( FILES view/structures/gccxml-to-osd.xsl DESTINATION ${DATA_INSTALL_DIR}/okteta/structures/ )
install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/struct2osd DESTINATION ${KDE_INSTALL_BINDIR} )
install( FILES view/structures/gccxml-to-osd.xsl DESTINATION ${KDE_INSTALL_DATADIR}/okteta/structures/ )
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OktetaKastenControllers")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/OktetaKastenControllers")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/OktetaKastenControllersConfig.cmake.in"
......
......@@ -16,7 +16,7 @@ if [ $# -lt 2 ]; then
exit;
fi;
XSL_CONVERTER="@DATA_INSTALL_DIR@/okteta/structures/gccxml-to-osd.xsl"
XSL_CONVERTER="@KDE_INSTALL_DATADIR@/okteta/structures/gccxml-to-osd.xsl"
INPUT_FILE="$1";
OSD_FILE="$2";
......
......@@ -96,7 +96,7 @@ set_target_properties( OktetaKastenCore PROPERTIES
SOVERSION ${OKTETAKASTENCORE_SOVERSION}
)
install( TARGETS OktetaKastenCore EXPORT OktetaKastenCoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaKastenCore EXPORT OktetaKastenCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${okteta_kastencore_LIB_HDRS}
DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
......@@ -108,7 +108,7 @@ install( FILES ${okteta_kastencore_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OktetaKastenCore")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/OktetaKastenCore")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/OktetaKastenCoreConfig.cmake.in"
......
......@@ -249,7 +249,7 @@ set_target_properties( OktetaKastenGui PROPERTIES
SOVERSION ${OKTETAKASTENGUI_SOVERSION}
)
install( TARGETS OktetaKastenGui EXPORT OktetaKastenGuiTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS OktetaKastenGui EXPORT OktetaKastenGuiTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${okteta_kastengui_LIB_HDRS}
DESTINATION ${OKTETAKASTEN_INCLUDE_INSTALL_DIR}
......@@ -261,7 +261,7 @@ install( FILES ${okteta_kastengui_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/OktetaKastenGui")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/OktetaKastenGui")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/OktetaKastenGuiConfig.cmake.in"
......
......@@ -3,8 +3,8 @@ set( KASTEN_MINOR_VERSION 3 )
set( KASTEN_PATCHLEVEL_VERSION 0 )
set( KASTEN_VERSION "${KASTEN_MAJOR_VERSION}.${KASTEN_MINOR_VERSION}.${KASTEN_PATCHLEVEL_VERSION}" )
set( KASTEN_ABI_VERSION 3 )
set( KASTEN_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/kasten ) #${KASTEN_ABI_VERSION} )
set( KASTEN_CCINCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/Kasten ) #${KASTEN_ABI_VERSION}
set( KASTEN_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/kasten ) #${KASTEN_ABI_VERSION} )
set( KASTEN_CCINCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/Kasten ) #${KASTEN_ABI_VERSION}
set( KASTEN_LIB_SOVERSION ${KASTEN_ABI_VERSION} )
set( KASTEN_LIB_VERSION ${KASTEN_VERSION} )
......
......@@ -332,7 +332,7 @@ set_target_properties( KastenControllers PROPERTIES
SOVERSION ${KASTENCONTROLLERS_SOVERSION}
)
install( TARGETS KastenControllers EXPORT KastenControllersTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS KastenControllers EXPORT KastenControllersTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${kastencontrollers_LIB_HDRS}
DESTINATION ${KASTEN_INCLUDE_INSTALL_DIR}
......@@ -344,7 +344,7 @@ install( FILES ${kastencontrollers_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KastenControllers")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KastenControllers")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KastenControllersConfig.cmake.in"
......
......@@ -207,7 +207,7 @@ set_target_properties( KastenCore PROPERTIES
SOVERSION ${KASTENCORE_SOVERSION}
)
install( TARGETS KastenCore EXPORT KastenCoreTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS KastenCore EXPORT KastenCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${kastencore_LIB_HDRS}
DESTINATION ${KASTEN_INCLUDE_INSTALL_DIR}
......@@ -219,7 +219,7 @@ install( FILES ${kastencore_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KastenCore")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KastenCore")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KastenCoreConfig.cmake.in"
......
......@@ -223,7 +223,7 @@ set_target_properties( KastenGui PROPERTIES
SOVERSION ${KASTENGUI_SOVERSION}
)
install( TARGETS KastenGui EXPORT KastenGuiTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS KastenGui EXPORT KastenGuiTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( FILES ${kastengui_LIB_HDRS}
DESTINATION ${KASTEN_INCLUDE_INSTALL_DIR}
......@@ -235,7 +235,7 @@ install( FILES ${kastengui_LIB_CCHDRS}
)
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KastenGui")
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KastenGui")
ecm_configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KastenGuiConfig.cmake.in"
......
......@@ -2,5 +2,5 @@
set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" )
find_package( SharedMimeInfo REQUIRED )
install( FILES okteta.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
install( FILES okteta.xml DESTINATION ${KDE_INSTALL_MIMEDIR} )
update_xdg_mimetypes( ${KDE_INSTALL_MIMEDIR} )
......@@ -20,7 +20,7 @@ target_link_libraries( oktetapart
KF5::Parts
)
install( TARGETS oktetapart DESTINATION ${PLUGIN_INSTALL_DIR})
install( TARGETS oktetapart DESTINATION ${KDE_INSTALL_PLUGINDIR})
if(${KF5_VERSION} VERSION_LESS "5.16.0")
kcoreaddons_desktop_to_json(oktetapart oktetapart.desktop)
else()
......@@ -29,7 +29,7 @@ endif()
install(
FILES oktetapartreadonlyui.rc oktetapartbrowserui.rc oktetapartreadwriteui.rc
DESTINATION ${KXMLGUI_INSTALL_DIR}/oktetapart
DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/oktetapart
)
if(BUILD_TESTING)
......
......@@ -27,14 +27,14 @@ target_link_libraries( okteta
KF5::DBusAddons
)
install( TARGETS okteta ${INSTALL_TARGETS_DEFAULT_ARGS} )
install( TARGETS okteta ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
install( PROGRAMS org.kde.okteta.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES oktetaui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/okteta )
install( PROGRAMS org.kde.okteta.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES oktetaui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/okteta )
install( FILES org.kde.okteta.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
ecm_install_icons(
ICONS 16-apps-okteta.png 32-apps-okteta.png 48-apps-okteta.png
DESTINATION ${ICON_INSTALL_DIR}
DESTINATION ${KDE_INSTALL_ICONDIR}
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment