Commit 7e02e61a authored by James Goppert's avatar James Goppert

Fixed cmake link issue with qserial.

parent a72efae6
...@@ -794,12 +794,12 @@ set (qserialHdrs ...@@ -794,12 +794,12 @@ set (qserialHdrs
thirdParty/qserial/include/QtSerialPort/qserialport_export.h thirdParty/qserial/include/QtSerialPort/qserialport_export.h
thirdParty/qserial/include/QtSerialPort/QSerialPort thirdParty/qserial/include/QtSerialPort/QSerialPort
thirdParty/qserial/include/QtSerialPort/qportsettings.h thirdParty/qserial/include/QtSerialPort/qportsettings.h
thirdParty/qserial/include/QtSerialPort/qserialport.h
thirdParty/qserial/include/QtSerialPort/qserialportnative.h
) )
# qserial headers with Q_OBJECT # qserial headers with Q_OBJECT
# r !grep -Rl Q_OBJECT thirdParty/qserial # r !grep -Rl Q_OBJECT thirdParty/qserial
set (qserialMocSrc set (qserialMocSrc
thirdParty/qserial/include/QtSerialPort/qserialport.h
thirdParty/qserial/include/QtSerialPort/qserialportnative.h
) )
# qserial src # qserial src
set (qserialSrc set (qserialSrc
...@@ -807,29 +807,23 @@ set (qserialSrc ...@@ -807,29 +807,23 @@ set (qserialSrc
thirdParty/qserial/src/common/qportsettings.cpp thirdParty/qserial/src/common/qportsettings.cpp
) )
# qserial resources
set(qserialRscSrc
thirdParty/qserial/src/QtSerialPortd_resource.rc
thirdParty/qserial/src/QtSerialPort_resource.rc
)
# qserial native code # qserial native code
#if (WIN32) if (WIN32)
#list(APPEND qserialHdrs list(APPEND qserialHdrs
#thirdParty/qserial/src/win32/commdcbhelper.h thirdParty/qserial/src/win32/commdcbhelper.h
#) )
#list(APPEND qserialMocSrc list(APPEND qserialMocSrc
#thirdParty/qserial/src/win32/qwincommevtnotifier.h thirdParty/qserial/src/win32/qwincommevtnotifier.h
#thirdParty/qserial/src/win32/wincommevtbreaker.h thirdParty/qserial/src/win32/wincommevtbreaker.h
#) )
#list(APPEND qserialSrc list(APPEND qserialSrc
#thirdParty/qserial/src/win32/qserialportnative_win32.cpp thirdParty/qserial/src/win32/qserialportnative_win32.cpp
#thirdParty/qserial/src/win32/commdcbhelper.cpp thirdParty/qserial/src/win32/commdcbhelper.cpp
#thirdParty/qserial/src/win32/qwincommevtnotifier.cpp thirdParty/qserial/src/win32/qwincommevtnotifier.cpp
##thirdParty/qserial/src/win32/qserialportnative_wince.cpp #thirdParty/qserial/src/win32/qserialportnative_wince.cpp
##thirdParty/qserial/src/win32/wincommevtbreaker.cpp #thirdParty/qserial/src/win32/wincommevtbreaker.cpp
#) )
#elseif(UNIX OR APPLE) elseif(UNIX OR APPLE)
list(APPEND qserialHdrs list(APPEND qserialHdrs
thirdParty/qserial/src/posix/termioshelper.h thirdParty/qserial/src/posix/termioshelper.h
) )
...@@ -837,13 +831,12 @@ set(qserialRscSrc ...@@ -837,13 +831,12 @@ set(qserialRscSrc
thirdParty/qserial/src/posix/termioshelper.cpp thirdParty/qserial/src/posix/termioshelper.cpp
thirdParty/qserial/src/posix/qserialportnative_posix.cpp thirdParty/qserial/src/posix/qserialportnative_posix.cpp
) )
#else() else()
#message(FATAL_ERROR "unknown OS") message(FATAL_ERROR "unknown OS")
#endif() endif()
# qserial linking # qserial linking
qt4_wrap_cpp(qserialMoc ${qserialMocSrc}) qt4_wrap_cpp(qserialMoc ${qserialMocSrc})
qt4_add_resources(qserialRsc ${qserialRscSrc})
add_library(qserial ${qserialMoc} ${qserialSrc}) add_library(qserial ${qserialMoc} ${qserialSrc})
target_link_libraries(qserial ${QT_LIBRARIES}) target_link_libraries(qserial ${QT_LIBRARIES})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment