From 545d39f0830037654b3a50bbf51b5e7379843671 Mon Sep 17 00:00:00 2001 From: paulfd Date: Fri, 30 Aug 2019 16:01:59 +0200 Subject: [PATCH] Added an option to build the clients or not --- CMakeLists.txt | 3 +++ scripts/asan_clang.sh | 2 +- scripts/debug_clang.sh | 2 +- scripts/debug_gcc.sh | 2 +- scripts/release_clang.sh | 2 +- scripts/release_gcc.sh | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3b9f457..28ea3380 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,7 +69,10 @@ add_library(readerwriterqueue INTERFACE) target_include_directories(readerwriterqueue INTERFACE "external/readerwriterqueue") add_subdirectory(sfizz) + +if (SFIZZ_CLIENTS) add_subdirectory(clients) +endif() if (SFIZZ_TESTS) # Tests diff --git a/scripts/asan_clang.sh b/scripts/asan_clang.sh index 4a560431..84acfcf9 100755 --- a/scripts/asan_clang.sh +++ b/scripts/asan_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_CXX_FLAGS="-fsanitize=address" -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_CXX_FLAGS="-fsanitize=address" -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/debug_clang.sh b/scripts/debug_clang.sh index 04bf0172..6b72ed93 100755 --- a/scripts/debug_clang.sh +++ b/scripts/debug_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/debug_gcc.sh b/scripts/debug_gcc.sh index 57ccb016..17a9685a 100755 --- a/scripts/debug_gcc.sh +++ b/scripts/debug_gcc.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/release_clang.sh b/scripts/release_clang.sh index da9c34c7..7759e67c 100755 --- a/scripts/release_clang.sh +++ b/scripts/release_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/release_gcc.sh b/scripts/release_gcc.sh index d8d01b78..264da08f 100755 --- a/scripts/release_gcc.sh +++ b/scripts/release_gcc.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . +cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B .