From 97d7f3fb057c322b344ed3420eee965e49551bcf Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Mon, 8 Oct 2018 05:10:54 +0200 Subject: [PATCH] Add "vpntest" to CMake --- src/CMakeLists.txt | 10 ++++++++++ src/vpntest/CMakeLists.txt | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 src/vpntest/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8842cab4..61905e3b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -115,6 +115,10 @@ get_target_property(VPNBRIDGE_RUNTIME_OUTPUT_DIRECTORY vpnbridge RUNTIME_OUTPUT_ add_subdirectory(vpncmd) get_target_property(VPNCMD_RUNTIME_OUTPUT_DIRECTORY vpncmd RUNTIME_OUTPUT_DIRECTORY) +# vpntest +add_subdirectory(vpntest) +get_target_property(VPNTEST_RUNTIME_OUTPUT_DIRECTORY vpntest RUNTIME_OUTPUT_DIRECTORY) + # hamcore.se2 archive file add_custom_target(hamcore-archive-build ALL @@ -148,6 +152,12 @@ add_custom_command(TARGET hamcore-archive-build COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/tmp/hamcore.se2 ${VPNCMD_RUNTIME_OUTPUT_DIRECTORY} ) +# Copy hamcore.se2 to vpntest's directory +add_custom_command(TARGET hamcore-archive-build + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/tmp/hamcore.se2 ${VPNTEST_RUNTIME_OUTPUT_DIRECTORY} +) + # Copy "vpnserver" directory to /usr/lib(exec)/softether/, install launch script and systemd service install(DIRECTORY ${VPNSERVER_RUNTIME_OUTPUT_DIRECTORY} COMPONENT "vpnserver" diff --git a/src/vpntest/CMakeLists.txt b/src/vpntest/CMakeLists.txt new file mode 100644 index 00000000..b8914254 --- /dev/null +++ b/src/vpntest/CMakeLists.txt @@ -0,0 +1,10 @@ +add_executable(vpntest vpntest.c vpntest.h) + +set_target_properties(vpntest + PROPERTIES + ARCHIVE_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpntest" + LIBRARY_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpntest" + RUNTIME_OUTPUT_DIRECTORY "${BUILD_DIRECTORY}/vpntest" +) + +target_link_libraries(vpntest cedar mayaqua)