w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-18 10:01:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression introduced backing out the wsjtx_udp shared library

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7014 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-08-07 00:01:36 +00:00
parent ba803dbc4c
commit 2607414fd7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -1135,29 +1135,29 @@ target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRA
qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
# make a library for WSJT-X UDP servers # make a library for WSJT-X UDP servers
add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS}) # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS}) add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
target_include_directories (wsjtx_udp #target_include_directories (wsjtx_udp
INTERFACE # INTERFACE
$<INSTALL_INTERFACE:${WSJT_INCLUDE_DESTINATION}/wsjtx> # $<INSTALL_INTERFACE:${WSJT_INCLUDE_DESTINATION}/wsjtx>
) # )
target_include_directories (wsjtx_udp-static target_include_directories (wsjtx_udp-static
INTERFACE INTERFACE
$<INSTALL_INTERFACE:${WSJT_INCLUDE_DESTINATION}/wsjtx> $<INSTALL_INTERFACE:${WSJT_INCLUDE_DESTINATION}/wsjtx>
) )
set_target_properties (wsjtx_udp PROPERTIES #set_target_properties (wsjtx_udp PROPERTIES
PUBLIC_HEADER "${UDP_library_HEADERS}" # PUBLIC_HEADER "${UDP_library_HEADERS}"
) # )
set_target_properties (wsjtx_udp-static PROPERTIES set_target_properties (wsjtx_udp-static PROPERTIES
OUTPUT_NAME wsjtx_udp OUTPUT_NAME wsjtx_udp
) )
target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE) target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
qt5_use_modules (wsjtx_udp Network) #qt5_use_modules (wsjtx_udp Network)
qt5_use_modules (wsjtx_udp-static Network) qt5_use_modules (wsjtx_udp-static Network)
generate_export_header (wsjtx_udp BASE_NAME udp) generate_export_header (wsjtx_udp-static BASE_NAME udp)
add_executable (udp_daemon UDPExamples/UDPDaemon.cpp UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE}) add_executable (udp_daemon UDPExamples/UDPDaemon.cpp UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE})
target_link_libraries (udp_daemon wsjtx_udp) target_link_libraries (udp_daemon wsjtx_udp-static)
add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS}) add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS})
configure_file (UDPExamples/message_aggregator.qrc.in message_aggregator.qrc @ONLY) configure_file (UDPExamples/message_aggregator.qrc.in message_aggregator.qrc @ONLY)
@ -1168,7 +1168,7 @@ add_executable (message_aggregator
UDPExamples/message_aggregator.rc UDPExamples/message_aggregator.rc
${message_aggregator_RESOURCES_RCC} ${message_aggregator_RESOURCES_RCC}
) )
target_link_libraries (message_aggregator Qt5::Widgets wsjtx_udp) target_link_libraries (message_aggregator Qt5::Widgets wsjtx_udp-static)
if (WSJT_CREATE_WINMAIN) if (WSJT_CREATE_WINMAIN)
set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON) set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)