diff options
author | msardara <msardara+fdio@cisco.com> | 2018-12-11 18:36:55 +0100 |
---|---|---|
committer | Damjan Marion <dmarion@me.com> | 2018-12-17 09:25:18 +0000 |
commit | 8f554b793c68fd5271334bf0e167dabc4c9ac73d (patch) | |
tree | a54ad410cdf3a839473551a59354956e3dc563cf /extras/libmemif/examples | |
parent | d6e9aecfd67ebfd012873eb24b72221f13e8f089 (diff) |
Added CMake building system for libmemif
Added Cpack support for building libmemif DEB/RPM packages
Fixed compilation errors in libmemif test and examples
Change-Id: I59a237a4ca8eb08840857d5b0e666f3a8d74411d
Signed-off-by: msardara <msardara+fdio@cisco.com>
Diffstat (limited to 'extras/libmemif/examples')
-rw-r--r-- | extras/libmemif/examples/CMakeLists.txt | 36 | ||||
-rw-r--r-- | extras/libmemif/examples/icmp_responder-zero-copy-slave/main.c | 2 |
2 files changed, 37 insertions, 1 deletions
diff --git a/extras/libmemif/examples/CMakeLists.txt b/extras/libmemif/examples/CMakeLists.txt new file mode 100644 index 00000000000..52b8f54216d --- /dev/null +++ b/extras/libmemif/examples/CMakeLists.txt @@ -0,0 +1,36 @@ +# Copyright (c) 2017 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + +set(HEADERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/icmp_responder) + +set(COMMON_SOURCE_FILES + icmp_responder/icmp_proto.c) + +list(APPEND EXAMPLES_LIST + icmp_responder/main.c + icmp_responder-epoll/main.c + icmp_responder-mt/main.c + icmp_responder-eb/main.c + icmp_responder-zero-copy-slave/main.c +) + +foreach (EXAMPLE_SRC ${EXAMPLES_LIST}) + string(FIND ${EXAMPLE_SRC} "/" INDEX) + string(SUBSTRING ${EXAMPLE_SRC} 0 ${INDEX} EXECUTABLE) + add_executable(${EXECUTABLE} ${COMMON_SOURCE_FILES} ${EXAMPLE_SRC}) + target_include_directories(${EXECUTABLE} PRIVATE $<BUILD_INTERFACE:${HEADERS_DIR}>) + target_link_libraries(${EXECUTABLE} ${LIBMEMIF} ${CMAKE_THREAD_LIBS_INIT}) +endforeach() + diff --git a/extras/libmemif/examples/icmp_responder-zero-copy-slave/main.c b/extras/libmemif/examples/icmp_responder-zero-copy-slave/main.c index 47f3ce5b01d..aad33039bd8 100644 --- a/extras/libmemif/examples/icmp_responder-zero-copy-slave/main.c +++ b/extras/libmemif/examples/icmp_responder-zero-copy-slave/main.c @@ -1248,7 +1248,7 @@ main () /* if valid callback is passed as argument, fd event polling will be done by user all file descriptors and events will be passed to user in this callback */ /* if callback is set to NULL libmemif will handle fd event polling */ - err = memif_init (control_fd_update, APP_NAME, NULL, NULL); + err = memif_init (control_fd_update, APP_NAME, NULL, NULL, NULL); if (err != MEMIF_ERR_SUCCESS) { INFO ("memif_init: %s", memif_strerror (err)); |