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>
pull/44/head
Michele Calgaro 3 years ago
parent 8d6af931c4
commit 37a6812fbe
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -58,7 +58,6 @@ tde_add_library( kghostviewlib SHARED AUTOMOC
kgvfactory.cpp generalsettingswidget.ui gssettingswidget.ui kgvfactory.cpp generalsettingswidget.ui gssettingswidget.ui
thumbnailservice.cpp configuration.kcfgc thumbnailservice.cpp configuration.kcfgc
LINK dscparse-static tdeprint-shared tdeparts-shared LINK dscparse-static tdeprint-shared tdeparts-shared
CXX_FEATURES cxx_nullptr
VERSION 0.0.0 VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -25,5 +25,4 @@ include_directories(
tde_add_library( dscparse STATIC_PIC tde_add_library( dscparse STATIC_PIC
SOURCES dscparse.cpp dscparse_adapter.cpp SOURCES dscparse.cpp dscparse_adapter.cpp
CXX_FEATURES cxx_nullptr
) )

@ -34,7 +34,6 @@ configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
tde_add_library( ksvg SHARED tde_add_library( ksvg SHARED
SOURCES dummy.cpp SOURCES dummy.cpp
CXX_FEATURES cxx_nullptr
VERSION 0.0.1 VERSION 0.0.1
EMBED EMBED
ksvgdom-static ksvgdomimpl-static ksvgcore-static ksvgecma-static ksvgdom-static ksvgdomimpl-static ksvgcore-static ksvgecma-static

@ -48,5 +48,4 @@ tde_add_library( ksvgcore STATIC_PIC AUTOMOC
SOURCES SOURCES
KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cpp KSVGTextChunk.cpp KSVGLoader.cpp KSVGCanvas.cpp KSVGReader.cpp KSVGTextChunk.cpp
CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp CanvasFactory.cpp CanvasItems.cpp KSVGHelper.cpp DocumentFactory.cpp
CXX_FEATURES cxx_nullptr
) )

@ -31,5 +31,4 @@ tde_add_library( ksvgecma STATIC_PIC AUTOMOC
SOURCES SOURCES
ksvg_scriptinterpreter.cpp ksvg_ecma.cpp ksvg_helper.cpp ksvg_scriptinterpreter.cpp ksvg_ecma.cpp ksvg_helper.cpp
ksvg_ecmaeventlistener.cpp ksvg_window.cpp ksvg_ecmaeventlistener.cpp ksvg_window.cpp
CXX_FEATURES cxx_nullptr
) )

@ -89,6 +89,5 @@ tde_add_library( ksvgdomimpl STATIC_PIC AUTOMOC
SVGFontFaceUriElementImpl.cpp SVGDefinitionSrcElementImpl.cpp SVGFontFaceUriElementImpl.cpp SVGDefinitionSrcElementImpl.cpp
SVGHKernElementImpl.cpp SVGVKernElementImpl.cpp SVGMetadataElementImpl.cpp SVGHKernElementImpl.cpp SVGVKernElementImpl.cpp SVGMetadataElementImpl.cpp
SVGForeignObjectElementImpl.cpp svgpathparser.cpp SVGForeignObjectElementImpl.cpp svgpathparser.cpp
CXX_FEATURES cxx_nullptr
LINK kjs-shared LINK kjs-shared
) )

@ -35,7 +35,6 @@ tde_add_library( text2path STATIC_PIC
SOURCES SOURCES
Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
GlyphTracer.cpp Converter.cpp QtUnicode.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
CXX_FEATURES cxx_nullptr
) )
##### text2path (shared) ######################## ##### text2path (shared) ########################
@ -45,7 +44,6 @@ tde_add_library( text2path SHARED
Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
GlyphTracer.cpp Converter.cpp QtUnicode.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
VERSION 0.0.0 VERSION 0.0.0
CXX_FEATURES cxx_nullptr
LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES} LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
) )

@ -46,6 +46,5 @@ tde_add_kpart( tdefile_ps AUTOMOC
tde_add_kpart( gsthumbnail AUTOMOC tde_add_kpart( gsthumbnail AUTOMOC
SOURCES gscreator.cpp SOURCES gscreator.cpp
LINK dscparse-static ${TQT_LIBRARIES} LINK dscparse-static ${TQT_LIBRARIES}
CXX_FEATURES cxx_nullptr
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

Loading…
Cancel
Save