commit 34d0e997c41cd6990432ae05a42c9806d861f528
Author: Georg Baum <[email protected]>
Date: Sun Mar 29 12:56:38 2015 +0200
support tests do not need QtGui anymore
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 6b8dd0c..cbd4047 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -168,32 +168,32 @@ check_PROGRAMS = \
check_trivstring
if INSTALL_MACOSX
-ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit
-framework ApplicationServices
+ADD_FRAMEWORKS = -framework QtCore -framework AppKit -framework
ApplicationServices
endif
-check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB)
$(LIBSHLWAPI) @LIBS@
-check_convert_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_convert_SOURCES = \
tests/check_convert.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB)
$(LIBSHLWAPI) @LIBS@
-check_filetools_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_filetools_SOURCES = \
tests/check_filetools.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB)
$(LIBSHLWAPI) @LIBS@
-check_lstrings_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_lstrings_SOURCES = \
tests/check_lstrings.cpp \
tests/dummy_functions.cpp \
tests/boost.cpp
-check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS) $(QT_LIB)
$(LIBSHLWAPI) @LIBS@
-check_trivstring_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
+check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(BOOST_LIBS)
$(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
+check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
check_trivstring_SOURCES = \
tests/check_trivstring.cpp \
tests/dummy_functions.cpp \
diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt
index 26e7d5c..6e5f3ed 100644
--- a/src/support/tests/CMakeLists.txt
+++ b/src/support/tests/CMakeLists.txt
@@ -20,7 +20,7 @@ macro(sources _program)
if(CYGWIN)
target_link_libraries(${_program} shlwapi)
endif()
- qt_use_modules(${_program} Core Gui)
+ qt_use_modules(${_program} Core)
endmacro()
file(GLOB test_sources ${TOP_SRC_DIR}/src/support/tests/${LYX_CPP_FILES})