From 259684d4768f64fe4f0773442cce83dec089720a Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Mon, 18 Jan 2021 16:37:20 +0100 Subject: [PATCH] Use non-deprecated KDEInstaUse non-deprecated KDEInstallDirs variables GIT_SILENT --- src/CMakeLists.txt | 2 +- src/drivers/CMakeLists.txt | 2 +- src/drivers/sqlite/dump/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 78c91e8c..4a392b63 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -250,7 +250,7 @@ if(BUILD_TEST_COVERAGE) endif() # Create a Config.cmake and a ConfigVersion.cmake file and install them -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/${KDB_BASE_NAME}") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${KDB_BASE_NAME}") ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KDB diff --git a/src/drivers/CMakeLists.txt b/src/drivers/CMakeLists.txt index 6fd7f14d..fb2005cc 100644 --- a/src/drivers/CMakeLists.txt +++ b/src/drivers/CMakeLists.txt @@ -5,7 +5,7 @@ endif() #TODO add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001) -set(KDB_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/${KDB_BASE_NAME_LOWER}) +set(KDB_PLUGIN_INSTALL_DIR ${KDE_INSTALL_PLUGINDIR}/${KDB_BASE_NAME_LOWER}) # ----------------------- macro(build_and_install_kdb_driver _name _srcs _extra_libs) diff --git a/src/drivers/sqlite/dump/CMakeLists.txt b/src/drivers/sqlite/dump/CMakeLists.txt index cfffb5c6..27093ccb 100644 --- a/src/drivers/sqlite/dump/CMakeLists.txt +++ b/src/drivers/sqlite/dump/CMakeLists.txt @@ -15,4 +15,4 @@ if(WIN32) PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE") endif() -install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS ${KDB_SQLITE_DUMP_TOOL} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -- 2.31.1