]> sigrok.org Git - pulseview.git/commitdiff
CMakeLists.txt, test/CMakeLists.txt: MinGW linking fix.
authorUwe Hermann <redacted>
Tue, 28 Jan 2014 16:55:51 +0000 (17:55 +0100)
committerUwe Hermann <redacted>
Tue, 28 Jan 2014 16:55:51 +0000 (17:55 +0100)
CMakeLists.txt
test/CMakeLists.txt

index a0c0803622e0b702f60e6fbcb89245f9d885b6bf..acec89764da6c3453d6c222555e36c11e5c51750 100644 (file)
@@ -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})
index 57ca26f0026de927c6fb60a0c77e3fd2271ed415..82e80a8af5d6535b31e0d73b8bb3f3f18d406370 100644 (file)
@@ -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}