From 68b94a3188d74ccf57af40139968e04fec61bf07 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Mon, 12 Aug 2019 12:35:07 -0700 Subject: [PATCH] CMake for edge branch --- controller/CMakeLists.txt | 2 + node/CMakeLists.txt | 77 ++++++++++++++++++++++++++++++++++++++- osdep/CMakeLists.txt | 2 + 3 files changed, 79 insertions(+), 2 deletions(-) diff --git a/controller/CMakeLists.txt b/controller/CMakeLists.txt index ac88e298a..c886b54b1 100644 --- a/controller/CMakeLists.txt +++ b/controller/CMakeLists.txt @@ -7,6 +7,7 @@ endif(WIN32) set(ctl_src DB.cpp + DBMirrorSet.cpp EmbeddedNetworkController.cpp FileDB.cpp LFDB.cpp @@ -15,6 +16,7 @@ set(ctl_src set(ctl_hdr DB.hpp + DBMirrorSet.hpp EmbeddedNetworkController.hpp FileDB.hpp LFDB.hpp diff --git a/node/CMakeLists.txt b/node/CMakeLists.txt index 9eeb3565b..add93405b 100644 --- a/node/CMakeLists.txt +++ b/node/CMakeLists.txt @@ -5,13 +5,86 @@ if(WIN32) add_definitions(-DNOMINMAX) endif(WIN32) -file(GLOB core_headers *.hpp) -file(GLOB core_src *.cpp) +set(core_headers + Address.hpp + AES.hpp + AtomicCounter.hpp + Buffer.hpp + C25519.hpp + Capability.hpp + CertificateOfMembership.hpp + CertificateOfOwnership.hpp + Constants.hpp + Credential.hpp + Dictionary.hpp + ECC384.hpp + Hashtable.hpp + Identity.hpp + InetAddress.hpp + Locator.hpp + MAC.hpp + Membership.hpp + Multicaster.hpp + MulticastGroup.hpp + Mutex.hpp + Network.hpp + NetworkConfig.hpp + Node.hpp + OutboundMulticast.hpp + Packet.hpp + Path.hpp + Peer.hpp + Poly1305.hpp + RingBuffer.hpp + RuntimeEnvironment.hpp + Salsa20.hpp + SelfAwareness.hpp + SHA512.hpp + SharedPtr.hpp + Str.hpp + Switch.hpp + Tag.hpp + Topology.hpp + Trace.hpp + Utils.hpp +) +set(core_src + AES.cpp + C25519.cpp + Capability.cpp + CertificateOfMembership.cpp + CertificateOfOwnership.cpp + ECC384.cpp + Identity.cpp + IncomingPacket.cpp + InetAddress.cpp + Membership.cpp + Multicaster.cpp + Network.cpp + NetworkConfig.cpp + Node.cpp + OutboundMulticast.cpp + Packet.cpp + Path.cpp + Peer.cpp + Poly1305.cpp + Revocation.cpp + Salsa20.cpp + SelfAwareness.cpp + SHA512.cpp + Switch.cpp + Tag.cpp + Topology.cpp + Trace.cpp + Utils.cpp +) add_library(${PROJECT_NAME} STATIC ${core_src} ${core_headers}) target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_11) if(UNIX) set_source_files_properties( + AES.cpp + ECC384.cpp Salsa20.cpp SHA512.cpp C25519.cpp diff --git a/osdep/CMakeLists.txt b/osdep/CMakeLists.txt index bde4fd4cd..f9e5d6d40 100644 --- a/osdep/CMakeLists.txt +++ b/osdep/CMakeLists.txt @@ -4,6 +4,7 @@ project(zt_osdep) set(src Arp.cpp Http.cpp + EthernetTap.cpp ManagedRoute.cpp NeighborDiscovery.cpp OSUtils.cpp @@ -14,6 +15,7 @@ set(headers Arp.hpp Binder.hpp BlockingQueue.hpp + EthernetTap.hpp Http.hpp ManagedRoute.hpp OSUtils.hpp