From 0cdbb3c6592da5dd330a7041149d8549fad3a48c Mon Sep 17 00:00:00 2001 From: Damien Gerard Date: Sat, 16 Jun 2018 12:28:48 +0900 Subject: cmake: group examples and unittests --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f17cab..1bf25f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,14 @@ project(args CXX) add_library(args INTERFACE) target_include_directories(args INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(gitlike examples/gitlike.cxx) +target_link_libraries(gitlike args) +set_property(TARGET gitlike PROPERTY CXX_STANDARD 11) + +add_executable(completion examples/completion.cxx) +target_link_libraries(completion args) +set_property(TARGET completion PROPERTY CXX_STANDARD 11) + add_executable(argstest test.cxx) target_link_libraries(argstest args) set_property(TARGET argstest PROPERTY CXX_STANDARD 11) @@ -40,18 +48,10 @@ add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cxx test/mu target_link_libraries(argstest-multiple-inclusion args) set_property(TARGET argstest-multiple-inclusion PROPERTY CXX_STANDARD 11) -add_executable(gitlike examples/gitlike.cxx) -target_link_libraries(gitlike args) -set_property(TARGET gitlike PROPERTY CXX_STANDARD 11) - add_executable(argstest-windows-h test/windows_h.cxx) target_link_libraries(argstest-windows-h args) set_property(TARGET argstest-windows-h PROPERTY CXX_STANDARD 11) -add_executable(completion examples/completion.cxx) -target_link_libraries(completion args) -set_property(TARGET completion PROPERTY CXX_STANDARD 11) - enable_testing() add_test(NAME "test" COMMAND argstest) add_test(NAME "test-multiple-inclusion" COMMAND argstest-multiple-inclusion) -- cgit v1.2.1 From cf5d6c6a53e2fe374592f2fbb68050ca6dedc651 Mon Sep 17 00:00:00 2001 From: Damien Gerard Date: Sat, 16 Jun 2018 12:28:57 +0900 Subject: cmake: make examples build optional --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bf25f8..d874d1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,16 +22,20 @@ cmake_minimum_required(VERSION 3.2) project(args CXX) +option(ARGS_BUILD_EXAMPLE "Build example" ON) + add_library(args INTERFACE) target_include_directories(args INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") -add_executable(gitlike examples/gitlike.cxx) -target_link_libraries(gitlike args) -set_property(TARGET gitlike PROPERTY CXX_STANDARD 11) +if (ARGS_BUILD_EXAMPLE) + add_executable(gitlike examples/gitlike.cxx) + target_link_libraries(gitlike args) + set_property(TARGET gitlike PROPERTY CXX_STANDARD 11) -add_executable(completion examples/completion.cxx) -target_link_libraries(completion args) -set_property(TARGET completion PROPERTY CXX_STANDARD 11) + add_executable(completion examples/completion.cxx) + target_link_libraries(completion args) + set_property(TARGET completion PROPERTY CXX_STANDARD 11) +endif() add_executable(argstest test.cxx) target_link_libraries(argstest args) -- cgit v1.2.1 From d4c364f021427e9d239f83b78319aa28b2287eef Mon Sep 17 00:00:00 2001 From: Damien Gerard Date: Sat, 16 Jun 2018 12:29:01 +0900 Subject: cmake: make unittests build optional --- CMakeLists.txt | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d874d1f..c59cfa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ cmake_minimum_required(VERSION 3.2) project(args CXX) option(ARGS_BUILD_EXAMPLE "Build example" ON) +option(ARGS_BUILD_UNITTESTS "Build unittests" ON) add_library(args INTERFACE) target_include_directories(args INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}") @@ -37,25 +38,27 @@ if (ARGS_BUILD_EXAMPLE) set_property(TARGET completion PROPERTY CXX_STANDARD 11) endif() -add_executable(argstest test.cxx) -target_link_libraries(argstest args) -set_property(TARGET argstest PROPERTY CXX_STANDARD 11) +if (ARGS_BUILD_UNITTESTS) + add_executable(argstest test.cxx) + target_link_libraries(argstest args) + set_property(TARGET argstest PROPERTY CXX_STANDARD 11) -if (MSVC) - target_compile_options(argstest PRIVATE /W4 /WX /bigobj) -else () - target_compile_options(argstest PRIVATE -Wall -Wextra -Werror -pedantic -Wshadow -Wunused-parameter) -endif () + if (MSVC) + target_compile_options(argstest PRIVATE /W4 /WX /bigobj) + else () + target_compile_options(argstest PRIVATE -Wall -Wextra -Werror -pedantic -Wshadow -Wunused-parameter) + endif () -add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cxx test/multiple_inclusion_2.cxx) + add_executable(argstest-multiple-inclusion test/multiple_inclusion_1.cxx test/multiple_inclusion_2.cxx) -target_link_libraries(argstest-multiple-inclusion args) -set_property(TARGET argstest-multiple-inclusion PROPERTY CXX_STANDARD 11) + target_link_libraries(argstest-multiple-inclusion args) + set_property(TARGET argstest-multiple-inclusion PROPERTY CXX_STANDARD 11) -add_executable(argstest-windows-h test/windows_h.cxx) -target_link_libraries(argstest-windows-h args) -set_property(TARGET argstest-windows-h PROPERTY CXX_STANDARD 11) + add_executable(argstest-windows-h test/windows_h.cxx) + target_link_libraries(argstest-windows-h args) + set_property(TARGET argstest-windows-h PROPERTY CXX_STANDARD 11) -enable_testing() -add_test(NAME "test" COMMAND argstest) -add_test(NAME "test-multiple-inclusion" COMMAND argstest-multiple-inclusion) + enable_testing() + add_test(NAME "test" COMMAND argstest) + add_test(NAME "test-multiple-inclusion" COMMAND argstest-multiple-inclusion) +endif() -- cgit v1.2.1