Use TDE cmake macro to set version

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 511a1ddc0f)
Add DBUS_TQT_LIBRARY_DIRS to the link_directories
5 changed files with 17 additions and 10 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -31,14 +31,9 @@ include( TDEMacros )
 enable_testing( )
-##### setup install paths #######################
+##### set version number ########################
-if( CMAKE_INSTALL_LIBDIR )
+tde_set_project_version( )
  tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
 endif( )
 include( TDESetupPaths )
 tde_setup_paths( )
 ##### optional stuff
@ -59,6 +54,17 @@ option( BUILD_TESTS    "Builds unit tests" ${BUILD_ALL} )
 include( ConfigureChecks.cmake )
 ##### setup install paths #######################
 tde_setup_install_path( CMAKE_INSTALL_DIR "${TQT_CMAKE_DIR}" )
 if( CMAKE_INSTALL_LIBDIR )
  tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
 endif( )
 include( TDESetupPaths )
 tde_setup_paths( )
 ##### write pkgconfig file ######################
 string( REGEX REPLACE "^${CMAKE_INSTALL_PREFIX}" "\${prefix}" PC_EXEC_PREFIX ${EXEC_INSTALL_PREFIX} )
--- a/agent/CMakeLists.txt
+++ b/agent/CMakeLists.txt
@ -21,6 +21,7 @@ include_directories(
 link_directories(
  ${TQT_LIBRARY_DIRS}
  ${POLKIT_GOBJECT_LIBRARY_DIRS}
 )
@ -43,7 +44,6 @@ tde_add_library( polkit-tqt-agent SHARED AUTOMOC
    listeneradapter.cpp
    polkit-tqt-listener.cpp
  VERSION 0.0.0
  CXX_FEATURES cxx_nullptr
  LINK polkit-tqt-core-shared
  LINK_PRIVATE ${POLKIT_GOBJECT_LIBRARIES} ${POLKIT_AGENT_LIBRARIES}
  DESTINATION ${LIB_INSTALL_DIR}
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@ -19,6 +19,7 @@ include_directories(
 link_directories(
  ${TQT_LIBRARY_DIRS}
  ${POLKIT_GOBJECT_LIBRARY_DIRS}
 )
@ -47,7 +48,6 @@ tde_add_library( polkit-tqt-core SHARED AUTOMOC
    polkit-tqt-subject.cpp
    polkit-tqt-temporaryauthorization.cpp
  VERSION 0.0.0
  CXX_FEATURES cxx_nullptr
  LINK ${TQT_LIBRARIES}
  LINK_PRIVATE ${POLKIT_GOBJECT_LIBRARIES}
  DESTINATION ${LIB_INSTALL_DIR}
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@ -22,6 +22,7 @@ include_directories(
 link_directories(
  ${TQT_LIBRARY_DIRS}
  ${DBUS_TQT_LIBRARY_DIRS}
 )
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@ -20,6 +20,7 @@ include_directories(
 link_directories(
  ${TQT_LIBRARY_DIRS}
  ${POLKIT_GOBJECT_LIBRARY_DIRS}
 )
@ -42,7 +43,6 @@ tde_add_library( polkit-tqt-gui SHARED AUTOMOC
    polkit-tqt-gui-actionbutton.cpp
    polkit-tqt-gui-actionbuttons.cpp
  VERSION 0.0.0
  CXX_FEATURES cxx_nullptr
  LINK polkit-tqt-core-shared
  LINK_PRIVATE ${POLKIT_GOBJECT_LIBRARIES}
  DESTINATION ${LIB_INSTALL_DIR}
Author	SHA1	Message	Date
Michele Calgaro	d1fcf13acd	Use TDE cmake macro to set version Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit `511a1ddc0f`)	3 years ago
aneejit1	b7557352a9	Add DBUS_TQT_LIBRARY_DIRS to the link_directories Add the library paths for the dbus-1-tqt library to the list of link_directories in the CMakeLists.txt files for the examples subdirectory to cater for the library not being in /usr. Signed-off-by: aneejit1 <aneejit1@gmail.com> (cherry picked from commit `0ba61b9a6b`)	3 years ago
aneejit1	6c3c07ec7c	Add POLKIT_GOBJECT_LIBRARY_DIRS to the link_directories Add the library paths for the glib/gobject libraries to the list of link_directories in the CMakeLists.txt files for core, gui, and agent subdirectories to cater for glib not being in /usr. Signed-off-by: aneejit1 <aneejit1@gmail.com> (cherry picked from commit `89acf6a1fd`)	3 years ago
Slávek Banko	371a1fed23	Update version number to the upcoming R14.0.13. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>	3 years ago
Michele Calgaro	905c36bbd2	Removed setting of CXX_FEATURES at module level since CXX_FEATURES are now enabled at TDE project level. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit `fc35cfac16`)	4 years ago
Slávek Banko	7ccbd3b0cd	Use TQT_CMAKE_DIR for installation of exported CMake targets. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit `2f98b15156`)	4 years ago
Michele Calgaro	fe5767ba0a	Added project version for r14.0.x branch. Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>	4 years ago