From fda417151cf8342a007cc32312b69c42d5baa14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ken=20A=2E=20Rederg=C3=A5rd?= <64542+kenr@users.noreply.github.com> Date: Mon, 4 Mar 2019 16:50:21 +0100 Subject: [PATCH] Remove test/example subdirectories, use what is provided by cmake (#212) --- examples/CMakeLists.txt | 4 +++- test/CMakeLists.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 14fc4e227..72cd98cae 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -24,7 +24,7 @@ function(setup_example example_directory) EXPORT ${PROJECT_NAME}-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/examples + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Examples ) endforeach() @@ -41,3 +41,5 @@ endif() setup_example(heart_rate_monitor) setup_example(heart_rate_collector) + +message(STATUS "Compiled examples are installed in directory \"${CMAKE_INSTALL_BINDIR}\"") diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6c4e22ad4..6d65a8daa 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -401,7 +401,7 @@ function(setup_test) EXPORT ${PROJECT_NAME}-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/tests + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Tests ) endfunction(setup_test) @@ -436,4 +436,6 @@ if(TEST_SOFTDEVICE_API) setup_test_run() add_run_test_targets() endif() + + message(STATUS "Compiled tests are installed in directory \"${CMAKE_INSTALL_BINDIR}\"") endif()