From d0111c2f8b5b73739f7193a79415e1d0bc8ee8c8 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Wed, 20 Mar 2019 11:03:25 +0100
Subject: [HICN-128] README utils and renaming of executables

Change-Id: I5e3cd78306d9f4a25197b54ca5b2779e600891c8
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 utils/CMakeLists.txt | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'utils/CMakeLists.txt')

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index f7ea729a8..9d3a77863 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -36,25 +36,30 @@ include(Packaging)
 
 set (COMPILER_DEFINITIONS "")
 
-list(APPEND UTILS_SRC
-  src/hiperf.cc
-  src/ping_client.cc
-  src/ping_server.cc
-)
-
 if (WIN32)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4200 /wd4996")
 endif ()
 
-foreach(util ${UTILS_SRC})
-  get_filename_component(_util_name ${util} NAME)
-  string(REGEX REPLACE ".cc" "" util_name ${_util_name})
-
-  build_executable(${util_name}
-    SOURCES ${util}
-    LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
-    DEPENDS ${LIBTRANSPORT}
-    COMPONENT ${HICN_UTILS}
-    DEFINITIONS ${COMPILER_DEFINITIONS}
-  )
-endforeach()
+build_executable(hiperf
+  SOURCES src/hiperf.cc
+  LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
+  DEPENDS ${LIBTRANSPORT}
+  COMPONENT ${HICN_UTILS}
+  DEFINITIONS ${COMPILER_DEFINITIONS}
+)
+
+build_executable(hicn-ping-server
+  SOURCES src/ping_server.cc
+  LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
+  DEPENDS ${LIBTRANSPORT}
+  COMPONENT ${HICN_UTILS}
+  DEFINITIONS ${COMPILER_DEFINITIONS}
+)
+
+build_executable(hicn-ping-client
+  SOURCES src/ping_client.cc
+  LINK_LIBRARIES ${LIBTRANSPORT_LIBRARIES} ${WSOCK32_LIBRARY} ${WS2_32_LIBRARY}
+  DEPENDS ${LIBTRANSPORT}
+  COMPONENT ${HICN_UTILS}
+  DEFINITIONS ${COMPILER_DEFINITIONS}
+)
-- 
cgit 1.2.3-korg