Skip to content
This repository was archived by the owner on Apr 13, 2019. It is now read-only.

Commit f83a600

Browse files
Glenn ScottGlenn Scott
Glenn Scott
authored and
Glenn Scott
committed
Merge branch 'master' into 3955-Add_support_for_the_ccnx_URI_scheme
2 parents f40f34e + 6c77a8d commit f83a600

File tree

2 files changed

+141
-78
lines changed

2 files changed

+141
-78
lines changed

‎CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
cmake_minimum_required(VERSION 3.2)
2-
project(cmake)
2+
3+
project(Metis)
4+
35
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
46

57
set(CMAKE_C_STANDARD 99)
68
set(CMAKE_C_STANDARD_REQUIRED ON)
79

10+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
11+
812
if( UNIX )
913
link_libraries(m)
1014
endif( UNIX )
@@ -63,6 +67,7 @@ macro(AddTest testFile)
6367
add_executable(${ARGV0} ${ARGV0}.c)
6468
target_link_libraries(${ARGV0} ${METIS_LINK_LIBRARIES})
6569
add_test(${ARGV0} ${ARGV0})
70+
set_target_properties(${ARGV0} PROPERTIES FOLDER Test)
6671
endmacro(AddTest)
6772

6873
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")

‎ccnx/forwarder/metis/CMakeLists.txt‎

Lines changed: 135 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ set(METIS_BASE_HEADERS
66
metis_About.h
77
)
88

9+
set(METIS_BASE_SOURCE
10+
metis_About.c
11+
)
12+
13+
source_group(core FILES ${METIS_BASE_HEADERS} ${METIS_BASE_SOURCE})
14+
915
set(METIS_CONFIG_HEADERS
1016
config/metis_CommandOps.h
1117
config/metis_CommandParser.h
@@ -36,6 +42,38 @@ set(METIS_CONFIG_HEADERS
3642
config/metis_WebInterface.h
3743
)
3844

45+
source_group(config FILES ${METIS_CONFIG_HEADERS})
46+
47+
set(METIS_CONFIG_SOURCE
48+
config/metis_CommandLineInterface.c
49+
config/metis_CommandOps.c
50+
config/metis_CommandParser.c
51+
config/metis_Configuration.c
52+
config/metis_ConfigurationFile.c
53+
config/metis_ConfigurationListeners.c
54+
config/metis_ControlState.c
55+
config/metis_SymbolicNameTable.c
56+
config/metisControl_Add.c
57+
config/metisControl_AddConnection.c
58+
config/metisControl_AddRoute.c
59+
config/metisControl_AddListener.c
60+
config/metisControl_List.c
61+
config/metisControl_ListConnections.c
62+
config/metisControl_ListInterfaces.c
63+
config/metisControl_ListRoutes.c
64+
config/metisControl_Quit.c
65+
config/metisControl_Remove.c
66+
config/metisControl_RemoveConnection.c
67+
config/metisControl_RemoveRoute.c
68+
config/metisControl_Root.c
69+
config/metisControl_Set.c
70+
config/metisControl_SetDebug.c
71+
config/metisControl_Unset.c
72+
config/metisControl_UnsetDebug.c
73+
)
74+
75+
source_group(config FILES ${METIS_CONFIG_SOURCE})
76+
3977
set(METIS_CONTENT_STORE_HEADERS
4078
content_store/metis_ContentStoreEntry.h
4179
content_store/metis_ContentStoreInterface.h
@@ -44,6 +82,18 @@ set(METIS_CONTENT_STORE_HEADERS
4482
content_store/metis_LruList.h
4583
)
4684

85+
source_group(content_store FILES ${METIS_CONTENT_STORE_HEADERS})
86+
87+
set(METIS_CONTENT_STORE_SOURCE
88+
content_store/metis_ContentStoreInterface.c
89+
content_store/metis_LRUContentStore.c
90+
content_store/metis_LruList.c
91+
content_store/metis_TimeOrderedList.c
92+
content_store/metis_ContentStoreEntry.c
93+
)
94+
95+
source_group(content_store FILES ${METIS_CONTENT_STORE_SOURCE})
96+
4797
set(METIS_CORE_HEADERS
4898
core/metis_ConnectionManager.h
4999
core/metis_Ticks.h
@@ -61,6 +111,24 @@ set(METIS_CORE_HEADERS
61111
core/metis_System.h
62112
)
63113

114+
source_group(core FILES ${METIS_CORE_HEADERS})
115+
116+
set(METIS_CORE_SOURCE
117+
core/metis_Connection.c
118+
core/metis_ConnectionList.c
119+
core/metis_ConnectionManager.c
120+
core/metis_ConnectionTable.c
121+
core/metis_Dispatcher.c
122+
core/metis_Forwarder.c
123+
core/metis_Logger.c
124+
core/metis_Message.c
125+
core/metis_NumberSet.c
126+
core/metis_StreamBuffer.c
127+
core/metis_ThreadedForwarder.c
128+
)
129+
130+
source_group(core FILES ${METIS_CORE_SOURCE})
131+
64132
set(METIS_IO_HEADERS
65133
io/metis_HopByHopFragmenter.h
66134
io/metis_EtherConnection.h
@@ -81,6 +149,27 @@ set(METIS_IO_HEADERS
81149
io/metis_Ethernet.h
82150
)
83151

152+
source_group(io FILES ${METIS_IO_HEADERS})
153+
154+
set(METIS_IO_SOURCE
155+
io/metis_AddressPair.c
156+
io/metis_EtherConnection.c
157+
io/metis_EtherListener.c
158+
io/metis_HopByHopFragmenter.c
159+
io/metis_IoOperations.c
160+
io/metis_IPMulticastListener.c
161+
io/metis_ListenerSet.c
162+
io/metis_LocalListener.c
163+
io/metis_StreamConnection.c
164+
io/metis_TcpListener.c
165+
io/metis_TcpTunnel.c
166+
io/metis_UdpConnection.c
167+
io/metis_UdpListener.c
168+
io/metis_UdpTunnel.c
169+
)
170+
171+
source_group(io FILES ${METIS_IO_SOURCE})
172+
84173
set(METIS_MESSENGER_HEADERS
85174
messenger/metis_MissiveDeque.h
86175
messenger/metis_Missive.h
@@ -89,6 +178,17 @@ set(METIS_MESSENGER_HEADERS
89178
messenger/metis_MessengerRecipient.h
90179
)
91180

181+
source_group(messenger FILES ${METIS_MESSENGER_HEADERS})
182+
183+
set(METIS_MESSENGER_SOURCE
184+
messenger/metis_Messenger.c
185+
messenger/metis_MessengerRecipient.c
186+
messenger/metis_Missive.c
187+
messenger/metis_MissiveDeque.c
188+
)
189+
190+
source_group(messenger FILES ${METIS_MESSENGER_SOURCE})
191+
92192
set(METIS_PROCESSOR_HEADERS
93193
processor/metis_FibEntry.h
94194
processor/metis_FibEntryList.h
@@ -103,12 +203,36 @@ set(METIS_PROCESSOR_HEADERS
103203
processor/metis_StandardPIT.h
104204
)
105205

206+
source_group(processor FILES ${METIS_PROCESSOR_HEADERS})
207+
208+
set(METIS_PROCESSOR_SOURCE
209+
processor/metis_HashTableFunction.c
210+
processor/metis_FIB.c
211+
processor/metis_FibEntry.c
212+
processor/metis_FibEntryList.c
213+
processor/metis_MatchingRulesTable.c
214+
processor/metis_MessageProcessor.c
215+
processor/metis_PIT.c
216+
processor/metis_PitEntry.c
217+
processor/metis_StandardPIT.c
218+
)
219+
220+
source_group(processor FILES ${METIS_PROCESSOR_SOURCE})
221+
106222
set(METIS_STRATEGIES_HEADERS
107223
strategies/metis_Strategy.h
108224
strategies/metis_StrategyImpl.h
109225
strategies/strategy_All.h
110226
)
111227

228+
source_group(strategies FILES ${METIS_STRATEGIES_HEADERS})
229+
230+
set(METIS_STRATEGIES_SOURCE
231+
strategies/strategy_All.c
232+
)
233+
234+
source_group(strategies FILES ${METIS_STRATEGIES_SOURCE})
235+
112236
set(METIS_TLV_HEADERS
113237
tlv/metis_TlvOps.h
114238
tlv/metis_Tlv.h
@@ -120,47 +244,7 @@ set(METIS_TLV_HEADERS
120244
tlv/metis_TlvSkeleton.h
121245
)
122246

123-
set(METIS_CONFIG_SOURCE
124-
config/metis_CommandLineInterface.c
125-
config/metis_CommandOps.c
126-
config/metis_CommandParser.c
127-
config/metis_Configuration.c
128-
config/metis_ConfigurationFile.c
129-
config/metis_ConfigurationListeners.c
130-
config/metis_ControlState.c
131-
config/metis_SymbolicNameTable.c
132-
config/metisControl_Add.c
133-
config/metisControl_AddConnection.c
134-
config/metisControl_AddRoute.c
135-
config/metisControl_AddListener.c
136-
config/metisControl_List.c
137-
config/metisControl_ListConnections.c
138-
config/metisControl_ListInterfaces.c
139-
config/metisControl_ListRoutes.c
140-
config/metisControl_Quit.c
141-
config/metisControl_Remove.c
142-
config/metisControl_RemoveConnection.c
143-
config/metisControl_RemoveRoute.c
144-
config/metisControl_Root.c
145-
config/metisControl_Set.c
146-
config/metisControl_SetDebug.c
147-
config/metisControl_Unset.c
148-
config/metisControl_UnsetDebug.c
149-
)
150-
151-
set(METIS_CORE_SOURCE
152-
core/metis_Connection.c
153-
core/metis_ConnectionList.c
154-
core/metis_ConnectionManager.c
155-
core/metis_ConnectionTable.c
156-
core/metis_Dispatcher.c
157-
core/metis_Forwarder.c
158-
core/metis_Logger.c
159-
core/metis_Message.c
160-
core/metis_NumberSet.c
161-
core/metis_StreamBuffer.c
162-
core/metis_ThreadedForwarder.c
163-
)
247+
source_group(tlv FILES ${METIS_TLV_HEADERS})
164248

165249
set(METIS_TLV_SOURCE
166250
tlv/metis_Tlv.c
@@ -172,11 +256,14 @@ set(METIS_TLV_SOURCE
172256
tlv/metis_TlvNameCodec.c
173257
)
174258

259+
source_group(tlv FILES ${METIS_TLV_SOURCE})
260+
175261
if ( APPLE )
176262
set(METIS_PLATFORM_MODULES
177263
platforms/darwin/metis_GenericEther.c
178264
platforms/darwin/metis_System.c
179265
)
266+
source_group(platforms FILES ${METIS_PLATFORM_MODULES})
180267
endif()
181268

182269
if( ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" )
@@ -190,44 +277,15 @@ set(METIS_SOURCE_FILES
190277
metis_About.c
191278
${METIS_CONFIG_SOURCE}
192279
${METIS_CORE_SOURCE}
193-
content_store/metis_ContentStoreInterface.c
194-
content_store/metis_LRUContentStore.c
195-
content_store/metis_LruList.c
196-
content_store/metis_TimeOrderedList.c
197-
content_store/metis_ContentStoreEntry.c
198-
${METIS_TLV_SOURCE}
199-
io/metis_AddressPair.c
200-
io/metis_EtherConnection.c
201-
io/metis_EtherListener.c
202-
io/metis_HopByHopFragmenter.c
203-
io/metis_IoOperations.c
204-
io/metis_IPMulticastListener.c
205-
io/metis_ListenerSet.c
206-
io/metis_LocalListener.c
207-
io/metis_StreamConnection.c
208-
io/metis_TcpListener.c
209-
io/metis_TcpTunnel.c
210-
io/metis_UdpConnection.c
211-
io/metis_UdpListener.c
212-
io/metis_UdpTunnel.c
213-
messenger/metis_Messenger.c
214-
messenger/metis_MessengerRecipient.c
215-
messenger/metis_Missive.c
216-
messenger/metis_MissiveDeque.c
217-
${METIS_PLATFORM_MODULES}
218-
processor/metis_HashTableFunction.c
219-
processor/metis_FIB.c
220-
processor/metis_FibEntry.c
221-
processor/metis_FibEntryList.c
222-
processor/metis_MatchingRulesTable.c
223-
processor/metis_MessageProcessor.c
224-
processor/metis_PIT.c
225-
processor/metis_PitEntry.c
226-
processor/metis_StandardPIT.c
227-
strategies/strategy_All.c
280+
${METIS_TLV_SOURCE}
281+
${METIS_CONTENT_STORE_SOURCE}
282+
${METIS_IO_SOURCE}
283+
${METIS_MESSENGER_SOURCE}
284+
${METIS_PLATFORM_MODULES}
285+
${METIS_PROCESSOR_SOURCE}
286+
${METIS_STRATEGIES_SOURCE}
228287
)
229288

230-
231289
add_library(metis STATIC ${METIS_SOURCE_FILES})
232290

233291
set(metis_libraries

0 commit comments

Comments
 (0)