Merge remote-tracking branch 'origin' into macos_compile

Conflicts:
	test/CMakeLists.txt

Former-commit-id: b91fa41ebbd5ec96f6a98dddc49f86b4b8af15d8
This commit is contained in:
T. van der Zwan
2013-12-20 20:02:02 +01:00
5 changed files with 41 additions and 2 deletions

View File

@@ -52,3 +52,9 @@ target_link_libraries(test_qregexp
add_executable(test_qtscreenshot TestQtScreenshot.cpp)
target_link_libraries(test_qtscreenshot
${QT_LIBRARIES})
add_executable(test_rs232highspeed
TestRs232HighSpeed.cpp
../libsrc/leddevice/LedRs232Device.cpp)
target_link_libraries(test_rs232highspeed
serialport)