summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2026-02-25 14:45:34 +0100
committerSlávek Banko <slavek.banko@axis.cz>2026-02-25 14:45:34 +0100
commit298cd5083af048a6d69224bfb2263185b870c003 (patch)
tree1a3b6ef74049c617f408439d3b86c94da8f1d51a /CMakeLists.txt
parent65da4c717517fdb2066a7887f64b63fd9e4d3bd1 (diff)
downloaddbus-1-tqt-master.tar.gz
dbus-1-tqt-master.zip
Use the default TDESetupPaths instead of custom settings.HEADmaster
This will ensure installation according to default multi-arch location used by the distribution. See TDE/tde-cmake#140. For INCLUDE_INSTALL_DIR, it is kept intact with the default value, with the installation being targeted to a subfolder. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt20
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f09103c..a9adf6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,9 +28,18 @@ include( FindPkgConfig )
include( CheckCXXSourceCompiles )
include( CheckSymbolExists )
+
+##### include our cmake modules #################
+
include( TDEMacros )
+##### setup install paths #######################
+
+include( TDESetupPaths )
+tde_setup_paths( )
+
+
##### optional stuff
option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
@@ -42,19 +51,10 @@ option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden"
include( ConfigureChecks.cmake )
-##### install paths setup #######################
-
-tde_setup_install_path( EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
-tde_setup_install_path( BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" )
-tde_setup_install_path( LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
-tde_setup_install_path( INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}" )
-tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig" )
-
-
##### write pkgconfig file ######################
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
-string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR} )
+string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_INCLUDE_DIR ${INCLUDE_INSTALL_DIR}/${CMAKE_PROJECT_NAME} )
string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_LIB_DIR ${LIB_INSTALL_DIR} )
configure_file( dbus-1-tqt.pc.cmake dbus-1-tqt.pc @ONLY )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dbus-1-tqt.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )