From 16e7c3a1701499e3528ecc71af402dd18bfe0538 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Fri, 28 Jan 2022 19:34:00 +0900
Subject: 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 37a6812fbebc918b17506cf6d51e3556c8cdc609)
---
 kghostview/CMakeLists.txt                      | 1 -
 kghostview/dscparse/CMakeLists.txt             | 1 -
 ksvg/CMakeLists.txt                            | 1 -
 ksvg/core/CMakeLists.txt                       | 1 -
 ksvg/ecma/CMakeLists.txt                       | 1 -
 ksvg/impl/CMakeLists.txt                       | 1 -
 ksvg/impl/libs/libtext2path/src/CMakeLists.txt | 2 --
 tdefile-plugins/ps/CMakeLists.txt              | 1 -
 8 files changed, 9 deletions(-)

diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt
index 5176447d..11e30d20 100644
--- a/kghostview/CMakeLists.txt
+++ b/kghostview/CMakeLists.txt
@@ -58,7 +58,6 @@ tde_add_library( kghostviewlib SHARED AUTOMOC
     kgvfactory.cpp  generalsettingswidget.ui gssettingswidget.ui
     thumbnailservice.cpp  configuration.kcfgc
   LINK dscparse-static tdeprint-shared tdeparts-shared
-	CXX_FEATURES cxx_nullptr
   VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kghostview/dscparse/CMakeLists.txt b/kghostview/dscparse/CMakeLists.txt
index 4f3c9922..a8136888 100644
--- a/kghostview/dscparse/CMakeLists.txt
+++ b/kghostview/dscparse/CMakeLists.txt
@@ -25,5 +25,4 @@ include_directories(
 
 tde_add_library( dscparse STATIC_PIC
   SOURCES dscparse.cpp dscparse_adapter.cpp
-	CXX_FEATURES cxx_nullptr
 )
diff --git a/ksvg/CMakeLists.txt b/ksvg/CMakeLists.txt
index e3fd997e..534cf56e 100644
--- a/ksvg/CMakeLists.txt
+++ b/ksvg/CMakeLists.txt
@@ -34,7 +34,6 @@ configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
 
 tde_add_library( ksvg SHARED
   SOURCES dummy.cpp
-  CXX_FEATURES cxx_nullptr
   VERSION 0.0.1
   EMBED
     ksvgdom-static ksvgdomimpl-static ksvgcore-static ksvgecma-static
diff --git a/ksvg/core/CMakeLists.txt b/ksvg/core/CMakeLists.txt
index db2ac2be..3818acaf 100644
--- a/ksvg/core/CMakeLists.txt
+++ b/ksvg/core/CMakeLists.txt
@@ -48,5 +48,4 @@ tde_add_library( ksvgcore STATIC_PIC AUTOMOC
   SOURCES
     KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cpp KSVGTextChunk.cpp
     CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp
-  CXX_FEATURES cxx_nullptr
 )
diff --git a/ksvg/ecma/CMakeLists.txt b/ksvg/ecma/CMakeLists.txt
index 8aa5c709..d70a02c6 100644
--- a/ksvg/ecma/CMakeLists.txt
+++ b/ksvg/ecma/CMakeLists.txt
@@ -31,5 +31,4 @@ tde_add_library( ksvgecma STATIC_PIC AUTOMOC
   SOURCES
     ksvg_scriptinterpreter.cpp ksvg_ecma.cpp ksvg_helper.cpp
     ksvg_ecmaeventlistener.cpp ksvg_window.cpp
-  CXX_FEATURES cxx_nullptr
 )
diff --git a/ksvg/impl/CMakeLists.txt b/ksvg/impl/CMakeLists.txt
index b8bfe01c..82980a01 100644
--- a/ksvg/impl/CMakeLists.txt
+++ b/ksvg/impl/CMakeLists.txt
@@ -89,6 +89,5 @@ tde_add_library( ksvgdomimpl STATIC_PIC AUTOMOC
     SVGFontFaceUriElementImpl.cpp SVGDefinitionSrcElementImpl.cpp
     SVGHKernElementImpl.cpp SVGVKernElementImpl.cpp SVGMetadataElementImpl.cpp
     SVGForeignObjectElementImpl.cpp svgpathparser.cpp
-  CXX_FEATURES cxx_nullptr
   LINK kjs-shared
 )
diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
index a6227857..29ab129e 100644
--- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
+++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
@@ -35,7 +35,6 @@ tde_add_library( text2path STATIC_PIC
   SOURCES
     Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
     GlyphTracer.cpp Converter.cpp QtUnicode.cpp
-	CXX_FEATURES cxx_nullptr
 )
 
 ##### text2path (shared) ########################
@@ -45,7 +44,6 @@ tde_add_library( text2path SHARED
     Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
     GlyphTracer.cpp Converter.cpp QtUnicode.cpp
   VERSION 0.0.0
-	CXX_FEATURES cxx_nullptr
   LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/tdefile-plugins/ps/CMakeLists.txt b/tdefile-plugins/ps/CMakeLists.txt
index cb9376aa..8706f44a 100644
--- a/tdefile-plugins/ps/CMakeLists.txt
+++ b/tdefile-plugins/ps/CMakeLists.txt
@@ -46,6 +46,5 @@ tde_add_kpart( tdefile_ps AUTOMOC
 tde_add_kpart( gsthumbnail AUTOMOC
   SOURCES gscreator.cpp
   LINK dscparse-static ${TQT_LIBRARIES}
-	CXX_FEATURES cxx_nullptr
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
-- 
cgit v1.2.1