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)

CMakeLists.txt

@@ -11,6 +11,7 @@
 
 ## Polkit TQt Library
 project("polkit-tqt")
+set( VERSION R14.0.12 )
 
 set(POLKIT-TQT_VERSION_MAJOR 0)
 set(POLKIT-TQT_VERSION_MINOR 103)
@@ -31,16 +32,6 @@ include( TDEMacros )
 enable_testing( )
 
 
-##### setup install paths #######################
-
-if( CMAKE_INSTALL_LIBDIR )
-  tde_setup_install_path( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" )
-endif( )
-
-include( TDESetupPaths )
-tde_setup_paths( )
-
-
 ##### optional stuff
 
 option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
@@ -59,6 +50,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} )

agent/CMakeLists.txt

@@ -43,7 +43,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}

core/CMakeLists.txt

@@ -47,7 +47,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}

gui/CMakeLists.txt

@@ -42,7 +42,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}