Fix build with GNU libstdc++ C++11 ABI

[lyx.git] / src / support / CMakeLists.txt

diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt
index b0d1c6db202f58ca12a57dadf6b69f42632b195d..009132961172349b832fa15a0a35ee924c977b87 100644 (file)
--- a/src/support/CMakeLists.txt
+++ b/src/support/CMakeLists.txt
@@ -33,6 +33,9 @@ list(REMOVE_ITEM support_sources
        ${TOP_SRC_DIR}/src/support/os_cygwin.cpp
        ${TOP_SRC_DIR}/src/support/os_os2.C
        ${TOP_SRC_DIR}/src/support/gettext.cpp)
+if(NOT STD_STRING_USES_COW)
+       list(REMOVE_ITEM support_sources ${TOP_SRC_DIR}/src/support/trivstring.cpp)
+endif()
 
 if(APPLE)
        message(STATUS "Mac LinkBack support")
@@ -78,11 +81,7 @@ else()
 endif()
 set_target_properties(support PROPERTIES FOLDER "applications/LyX")
 
-if(USE_MACOSX_PACKAGING AND Qt5Core_FOUND)
-       qt_use_modules(support Core Gui)
-else()
-       qt_use_modules(support Core)
-endif()
+qt_use_modules(support Core Gui)
 
 target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY})