aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2018-08-28 13:20:44 +0200
committerDamjan Marion <dmarion@me.com>2018-08-28 11:42:44 +0000
commit258a4cf56abc4bc59956709f3a1f1a0063a14280 (patch)
treeffed7d2228bbb8812075d2ac0267b1c17fa681b6
parente7e5de0693a7a40f96d9410d103a64c8cdc51441 (diff)
cmake: don't install some test executable
To be equal in what autotools do... Change-Id: Ib9f1609f803622a364a08e2c73d6c0fae3d85f3f Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/cmake/exec.cmake6
-rw-r--r--src/vcl/CMakeLists.txt3
-rw-r--r--src/vpp/CMakeLists.txt2
3 files changed, 8 insertions, 3 deletions
diff --git a/src/cmake/exec.cmake b/src/cmake/exec.cmake
index b8277fa8389..d5e837084e9 100644
--- a/src/cmake/exec.cmake
+++ b/src/cmake/exec.cmake
@@ -13,7 +13,7 @@
macro(add_vpp_executable exec)
cmake_parse_arguments(ARG
- "ENABLE_EXPORTS"
+ "ENABLE_EXPORTS;NO_INSTALL"
""
"SOURCES;LINK_LIBRARIES;DEPENDS"
${ARGN}
@@ -29,6 +29,8 @@ macro(add_vpp_executable exec)
if(ARG_DEPENDS)
add_dependencies(${exec} ${ARG_DEPENDS})
endif()
- install(TARGETS ${exec} DESTINATION bin)
+ if(NOT ARG_NO_INSTALL)
+ install(TARGETS ${exec} DESTINATION bin)
+ endif()
endmacro()
diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
index 840a62ad85e..b6d496418d5 100644
--- a/src/vcl/CMakeLists.txt
+++ b/src/vcl/CMakeLists.txt
@@ -50,7 +50,8 @@ if(VPP_BUILD_VCL_TESTS)
test_vcl_listener_server
test_vcl_listener_client
)
- add_vpp_executable(${test} SOURCES ${test}.c LINK_LIBRARIES vppcom)
+ add_vpp_executable(${test} SOURCES ${test}.c LINK_LIBRARIES vppcom
+ NO_INSTALL)
endforeach()
endif(VPP_BUILD_VCL_TESTS)
diff --git a/src/vpp/CMakeLists.txt b/src/vpp/CMakeLists.txt
index 6f58e8db8ec..7e59090fc2e 100644
--- a/src/vpp/CMakeLists.txt
+++ b/src/vpp/CMakeLists.txt
@@ -107,11 +107,13 @@ add_vpp_executable(summary_stats_client
SOURCES api/summary_stats_client.c
LINK_LIBRARIES vppinfra svm vlibmemoryclient
DEPENDS api_headers
+ NO_INSTALL
)
add_vpp_executable(stat_client
SOURCES app/stat_client.c
LINK_LIBRARIES vppinfra svm vlibmemoryclient
DEPENDS api_headers
+ NO_INSTALL
)