mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
Fix make check
We have to explicitly link zlib after [197ea636/lyxgit].
This commit is contained in:
parent
3a1b19c5c3
commit
04c0cce43e
@ -173,28 +173,28 @@ ADD_FRAMEWORKS = \
|
|||||||
-Wl,-headerpad_max_install_names
|
-Wl,-headerpad_max_install_names
|
||||||
endif
|
endif
|
||||||
|
|
||||||
check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
check_convert_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
||||||
check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_convert_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_convert_SOURCES = \
|
check_convert_SOURCES = \
|
||||||
tests/check_convert.cpp \
|
tests/check_convert.cpp \
|
||||||
tests/dummy_functions.cpp \
|
tests/dummy_functions.cpp \
|
||||||
tests/boost.cpp
|
tests/boost.cpp
|
||||||
|
|
||||||
check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
check_filetools_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
||||||
check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_filetools_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_filetools_SOURCES = \
|
check_filetools_SOURCES = \
|
||||||
tests/check_filetools.cpp \
|
tests/check_filetools.cpp \
|
||||||
tests/dummy_functions.cpp \
|
tests/dummy_functions.cpp \
|
||||||
tests/boost.cpp
|
tests/boost.cpp
|
||||||
|
|
||||||
check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
check_lstrings_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
||||||
check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_lstrings_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_lstrings_SOURCES = \
|
check_lstrings_SOURCES = \
|
||||||
tests/check_lstrings.cpp \
|
tests/check_lstrings.cpp \
|
||||||
tests/dummy_functions.cpp \
|
tests/dummy_functions.cpp \
|
||||||
tests/boost.cpp
|
tests/boost.cpp
|
||||||
|
|
||||||
check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
check_trivstring_LDADD = liblyxsupport.a $(LIBICONV) $(ZLIB_LIBS) $(QT_CORE_LIBS) $(LIBSHLWAPI) @LIBS@
|
||||||
check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
check_trivstring_LDFLAGS = $(QT_CORE_LDFLAGS) $(ADD_FRAMEWORKS)
|
||||||
check_trivstring_SOURCES = \
|
check_trivstring_SOURCES = \
|
||||||
tests/check_trivstring.cpp \
|
tests/check_trivstring.cpp \
|
||||||
|
Loading…
Reference in New Issue
Block a user