cmake添加NO_MOC来应对直接粗暴include moc生成的源代码
parent
da25df7311
commit
5407bf8b1e
|
@ -16,37 +16,35 @@ list(APPEND EXTSERIAL_SOURCES
|
||||||
${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator.cpp
|
${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator.cpp
|
||||||
)
|
)
|
||||||
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||||
list(APPEND EXTSERIAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialport_unix.cpp)
|
message("CMAKE_SYSTEM_NAME is ${CMAKE_SYSTEM_NAME}")
|
||||||
list(APPEND EXTSERIAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator_linux.cpp)
|
list(APPEND NO_MOC_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialport_unix.cpp)
|
||||||
|
list(APPEND NO_MOC_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator_linux.cpp)
|
||||||
|
|
||||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||||
list(APPEND EXTSERIAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialport_win.cpp)
|
message("CMAKE_SYSTEM_NAME is ${CMAKE_SYSTEM_NAME}")
|
||||||
list(APPEND EXTSERIAL_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator_win.cpp)
|
list(APPEND NO_MOC_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialport_win.cpp)
|
||||||
|
list(APPEND NO_MOC_SOURCES ${CMAKE_CURRENT_LIST_DIR}/qextserialenumerator_win.cpp)
|
||||||
link_libraries(setupapi advapi32 user32)
|
link_libraries(setupapi advapi32 user32)
|
||||||
|
|
||||||
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
||||||
|
message("CMAKE_SYSTEM_NAME is ${FreeBSD}")
|
||||||
|
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
QT5_WRAP_CPP(EXTSERIAL_MOC_SOURCE ${EXTSERIAL_SOURCES} ) # moc预编译代码
|
QT5_WRAP_CPP(EXTSERIAL_MOC ${EXTSERIAL_SOURCES} ) # moc预编译代码
|
||||||
QT5_WRAP_CPP(EXTSERIAL_MOC_HEADER ${EXTSERIAL_HEADERS} ) # moc预编译代码
|
QT5_WRAP_CPP(EXTSERIAL_MOCHEADER ${EXTSERIAL_HEADERS} ) # moc预编译代码
|
||||||
|
|
||||||
|
|
||||||
list(APPEND MOC ${EXTSERIAL_MOC_SOURCE})
|
FOREACH(list ${EXTSERIAL_MOCHEADER})
|
||||||
list(APPEND SOURCES ${EXTSERIAL_SOURCES})
|
|
||||||
|
|
||||||
|
|
||||||
FOREACH(list ${EXTSERIAL_MOC_SOURCE})
|
|
||||||
get_filename_component(BIN_PATH ${list} "DIRECTORY" )
|
get_filename_component(BIN_PATH ${list} "DIRECTORY" )
|
||||||
message("EXTSERIAL_MOC_SOURCE file" ${list})
|
message("EXTSERIAL_MOCHEADER file" ${list} ${BIN_PATH})
|
||||||
ENDFOREACH(list)
|
|
||||||
|
|
||||||
FOREACH(list ${EXTSERIAL_MOC_HEADER})
|
|
||||||
message("EXTSERIAL_MOC_HEADER file " ${list})
|
|
||||||
ENDFOREACH(list)
|
|
||||||
|
|
||||||
message("EXTSERIAL_MOC_SOURCE file " ${BIN_PATH})
|
|
||||||
include_directories(${BIN_PATH})
|
include_directories(${BIN_PATH})
|
||||||
|
ENDFOREACH(list)
|
||||||
|
|
||||||
|
# list(APPEND HEADERS ${EXTSERIAL_HEADERS})
|
||||||
|
# list(APPEND SOURCES ${EXTSERIAL_SOURCES})
|
||||||
|
|
||||||
|
list(APPEND NO_MOC_SOURCES ${EXTSERIAL_SOURCES})
|
||||||
include_directories(${CMAKE_CURRENT_LIST_DIR})
|
include_directories(${CMAKE_CURRENT_LIST_DIR})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
|
|
||||||
#include "qextserialport.h"
|
#include "qextserialport.h"
|
||||||
#include "qextserialport_p.h"
|
#include "qextserialport_p.h"
|
||||||
|
|
||||||
#include <QtCore/QThread>
|
#include <QtCore/QThread>
|
||||||
#include <QtCore/QReadWriteLock>
|
#include <QtCore/QReadWriteLock>
|
||||||
#include <QtCore/QMutexLocker>
|
#include <QtCore/QMutexLocker>
|
||||||
|
@ -403,3 +404,4 @@ void QextSerialPortPrivate::updatePortSettings()
|
||||||
SetCommTimeouts(handle, &commTimeouts);
|
SetCommTimeouts(handle, &commTimeouts);
|
||||||
settingsDirtyFlags = 0;
|
settingsDirtyFlags = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue