From 7cfb538d044b7400f2c62695cde4e9b0e440bb3d Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 28 Jan 2014 17:55:51 +0100 Subject: [PATCH] CMakeLists.txt, test/CMakeLists.txt: MinGW linking fix. --- CMakeLists.txt | 4 ++++ test/CMakeLists.txt | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a0c0803..acec897 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,6 +284,10 @@ set(PULSEVIEW_LINK_LIBS if(STATIC_PKGDEPS_LIBS) link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS}) list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES}) +if(WIN32) + # Workaround for a MinGW linking issue. + list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") +endif() else() link_directories(${PKGDEPS_LIBRARY_DIRS}) list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 57ca26f..82e80a8 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -150,6 +150,11 @@ set(PULSEVIEW_LINK_LIBS ${QT_LIBRARIES} ) +if(WIN32) + # Workaround for a MinGW linking issue. + list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") +endif() + add_executable(pulseview-test ${pulseview_TEST_SOURCES} ${pulseview_TEST_HEADERS_MOC} -- 2.30.2