Merge branch 'master' of https://git.epicsparrow.com/EpicSparrow/CMakeTemplate
This commit is contained in:
commit
0084700820
@ -384,13 +384,21 @@ if(QT_MODULE)
|
|||||||
if(";${QT_MODULE};" MATCHES ";network;")
|
if(";${QT_MODULE};" MATCHES ";network;")
|
||||||
find_package(Qt5Network REQUIRED)
|
find_package(Qt5Network REQUIRED)
|
||||||
if(Qt5Network_FOUND)
|
if(Qt5Network_FOUND)
|
||||||
MESSAGE(STATUS "found QT nework")
|
MESSAGE(STATUS "found QT network")
|
||||||
MESSAGE(STATUS "test: " ${Qt5Network_LIBRARIES})
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${Qt5Network_LIBRARIES} -lssleay32 -leay32)
|
||||||
LIST(APPEND LIB_DEPENDENCIES_LIST ${Qt5Network_LIBRARIES} -lssleay32 -leay32)
|
# LIST(APPEND LIB_DEPENDENCIES_LIST ${Qt5Network_LIBRARIES})
|
||||||
add_definitions(${Qt5Network_DEFINITIONS})
|
add_definitions(${Qt5Network_DEFINITIONS})
|
||||||
LIST(APPEND INCLUDES_PATHS ${Qt5Network_INCLUDES})
|
LIST(APPEND INCLUDES_PATHS ${Qt5Network_INCLUDES})
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
if(";${QT_MODULE};" MATCHES ";websockets;")
|
||||||
|
find_package(Qt5WebSockets REQUIRED)
|
||||||
|
if(Qt5WebSockets_FOUND)
|
||||||
|
MESSAGE(STATUS "found QT websockets")
|
||||||
|
LIST(APPEND LIB_DEPENDENCIES_LIST ${Qt5WebSockets_LIBRARIES})
|
||||||
|
LIST(APPEND INCLUDE_PATHS ${Qt5WebSockets_INCLUDES})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(USE_RENDERER)
|
if(USE_RENDERER)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user