From 470611a473bdc377fa54e30db09439dc7a63f0de Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 4 Feb 2014 14:57:03 -0700 Subject: [PATCH] CMake: Interrogate/build nativenet, net. --- panda/CMakeLists.txt | 6 ++++-- panda/src/nativenet/CMakeLists.txt | 30 ++++++++++++++++++++++++++++ panda/src/net/CMakeLists.txt | 32 ++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 panda/src/nativenet/CMakeLists.txt create mode 100644 panda/src/net/CMakeLists.txt diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt index f648f44d2c..30ddcd6877 100644 --- a/panda/CMakeLists.txt +++ b/panda/CMakeLists.txt @@ -52,6 +52,8 @@ add_subdirectory(src/tform) add_subdirectory(src/pgui) add_subdirectory(src/recorder) add_subdirectory(src/collide) +add_subdirectory(src/nativenet) +add_subdirectory(src/net) add_subdirectory(src/egg) add_subdirectory(src/egg2pg) add_subdirectory(src/framework) @@ -64,6 +66,6 @@ add_subdirectory(metalibs/pandaegg) add_python_module(core p3chan p3char p3collide p3cull p3device p3dgraph p3display p3downloader p3event p3express p3gobj p3grutil p3gsgbase p3linmath - p3mathutil p3parametrics p3pgraph p3pgraphnodes p3pgui p3pipeline p3pnmimage - p3pnmtext p3pstatclient p3putil p3recorder p3text p3tform) + p3mathutil p3nativenet p3net p3parametrics p3pgraph p3pgraphnodes p3pgui + p3pipeline p3pnmimage p3pnmtext p3pstatclient p3putil p3recorder p3text p3tform) add_python_module(egg p3egg p3egg2pg) diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt new file mode 100644 index 0000000000..3e13361410 --- /dev/null +++ b/panda/src/nativenet/CMakeLists.txt @@ -0,0 +1,30 @@ +if(WANT_NATIVE_NET) + set(P3NATIVENET_HEADERS + buffered_datagramconnection.h + buffered_datagramreader.h buffered_datagramreader.i + ringbuffer.h ringbuffer.i socket_ip.h + socket_tcp_listen.h time_accumulator.h time_out.h + socket_address.h + socket_portable.h time_base.h time_span.h buffered_datagramwriter.h + socket_base.h socket_selector.h + socket_udp.h + socket_udp_incoming.h time_clock.h + membuffer.h membuffer.i socket_fdset.h socket_tcp.h + socket_udp_outgoing.h time_general.h) + + set(P3NATIVENET_SOURCES + config_nativenet.cxx + buffered_datagramconnection.cxx + socket_ip.cxx + socket_tcp.cxx + socket_tcp_listen.cxx + socket_tcp_ssl.cxx + socket_udp.cxx + socket_udp_incoming.cxx + socket_udp_outgoing.cxx) + + composite_sources(p3nativenet P3NATIVENET_SOURCES) + add_library(p3nativenet ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES}) + target_link_libraries(p3nativenet p3express p3pandabase) + target_interrogate(p3nativenet ALL) +endif() diff --git a/panda/src/net/CMakeLists.txt b/panda/src/net/CMakeLists.txt new file mode 100644 index 0000000000..9fec4780fc --- /dev/null +++ b/panda/src/net/CMakeLists.txt @@ -0,0 +1,32 @@ +if(HAVE_NET AND WANT_NATIVE_NET) + set(P3NET_HEADERS + config_net.h connection.h connectionListener.h + connectionManager.N connectionManager.h + connectionReader.I connectionReader.h + connectionWriter.h datagramQueue.h + datagramTCPHeader.I datagramTCPHeader.h + datagramUDPHeader.I datagramUDPHeader.h + netAddress.h netDatagram.I netDatagram.h + datagramGeneratorNet.I datagramGeneratorNet.h + datagramSinkNet.I datagramSinkNet.h + queuedConnectionListener.I + queuedConnectionListener.h queuedConnectionManager.h + queuedConnectionReader.h recentConnectionReader.h + queuedReturn.h queuedReturn.I) + + set(P3NET_SOURCES + config_net.cxx connection.cxx connectionListener.cxx + connectionManager.cxx connectionReader.cxx + connectionWriter.cxx datagramQueue.cxx datagramTCPHeader.cxx + datagramUDPHeader.cxx netAddress.cxx netDatagram.cxx + datagramGeneratorNet.cxx + datagramSinkNet.cxx + queuedConnectionListener.cxx + queuedConnectionManager.cxx queuedConnectionReader.cxx + recentConnectionReader.cxx) + + composite_sources(p3net P3NET_SOURCES) + add_library(p3net ${P3NET_HEADERS} ${P3NET_SOURCES}) + target_link_libraries(p3net p3express p3downloader p3pandabase p3nativenet p3pipeline) + target_interrogate(p3net ALL) +endif()