]> git.lyx.org Git - lyx.git/blobdiff - src/support/CMakeLists.txt
Fix build with GNU libstdc++ C++11 ABI
[lyx.git] / src / support / CMakeLists.txt
index 4a018e8cce8944396d3874a07133fed8dd1133e6..009132961172349b832fa15a0a35ee924c977b87 100644 (file)
@@ -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")
@@ -41,10 +44,6 @@ else()
        set(support_linkback_headers "")
 endif()
 
-if(UNIX AND CMAKE_COMPILER_IS_GNUCC AND NOT APPLE)
-       add_definitions(-DLYX_CALLSTACK_PRINTING)
-endif()
-
 add_subdirectory(tests)
 
 # needed to compile tex2lyx in merged mode
@@ -82,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})