From 756f77e49bc6ac6483384644e519e20fb2d433b9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 22 Jan 2022 19:48:12 +0900 Subject: Added CXX_FEATURES for libraries to ensure build with at least C++11. Signed-off-by: Michele Calgaro (cherry picked from commit 375229ceea1bf7b7c31fcf1f1c16c699c8e0b475) --- kghostview/CMakeLists.txt | 1 + kghostview/dscparse/CMakeLists.txt | 1 + ksvg/impl/libs/libtext2path/src/CMakeLists.txt | 4 +++- tdefile-plugins/ps/CMakeLists.txt | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt index 11e30d20..5176447d 100644 --- a/kghostview/CMakeLists.txt +++ b/kghostview/CMakeLists.txt @@ -58,6 +58,7 @@ 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 a8136888..4f3c9922 100644 --- a/kghostview/dscparse/CMakeLists.txt +++ b/kghostview/dscparse/CMakeLists.txt @@ -25,4 +25,5 @@ include_directories( tde_add_library( dscparse STATIC_PIC SOURCES dscparse.cpp dscparse_adapter.cpp + CXX_FEATURES cxx_nullptr ) diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt index 098f836d..a6227857 100644 --- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt +++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt @@ -35,6 +35,7 @@ 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) ######################## @@ -44,6 +45,7 @@ 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} -) \ No newline at end of file +) diff --git a/tdefile-plugins/ps/CMakeLists.txt b/tdefile-plugins/ps/CMakeLists.txt index 8706f44a..cb9376aa 100644 --- a/tdefile-plugins/ps/CMakeLists.txt +++ b/tdefile-plugins/ps/CMakeLists.txt @@ -46,5 +46,6 @@ 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.3