From eac1778729dc76a53306d0a4f80a1a940193f840 Mon Sep 17 00:00:00 2001
From: E Sequeira <5458743+geseq@users.noreply.github.com>
Date: Tue, 9 May 2023 23:27:31 +0100
Subject: [PATCH] improve cmakelists (#34)

---
 CMakeLists.txt | 86 ++++++++++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f779ec..c610ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,64 +1,68 @@
 cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-project("fastchan" LANGUAGES CXX)
+project(fastchan LANGUAGES CXX)
 enable_testing()
 
 set(CMAKE_CXX_STANDARD 17)
 
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
-add_library(fastchan include/spsc.hpp include/mpsc.hpp)
+add_library(fastchan INTERFACE)
+target_sources(fastchan INTERFACE include/spsc.hpp include/mpsc.hpp)
+target_include_directories(fastchan INTERFACE include/)
+
 set_target_properties(fastchan PROPERTIES LINKER_LANGUAGE CXX)
 
 find_package(Threads)
 
-
+option(ENABLE_TESTING "Enable test target generation" ON)
 option(BENCHMARK_ENABLE_TESTING "run benchmarks" OFF)
 
-FILE(GLOB tests ${PROJECT_SOURCE_DIR}/test/*)
-FOREACH (test ${tests})
-    get_filename_component(test_name ${test} NAME)
-    message("Adding test: " ${test_name})
-    add_executable(${test_name} ${PROJECT_SOURCE_DIR}/test/${test_name})
-    target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
-    target_include_directories(${test_name} PUBLIC ${PROJECT_SOURCE_DIR}/include)
-    add_test(${test_name} ${test_name})
-    set_property(TEST ${test_name} PROPERTY LABELS "test")
-ENDFOREACH ()
+if (ENABLE_TESTING)
+    FILE(GLOB tests ${PROJECT_SOURCE_DIR}/test/*)
+    FOREACH (test ${tests})
+        get_filename_component(test_name ${test} NAME)
+        message("Adding test: " ${test_name})
+        add_executable(${test_name} ${PROJECT_SOURCE_DIR}/test/${test_name})
+        target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
+        target_link_libraries(${test_name} PRIVATE fastchan)
+        add_test(${test_name} ${test_name})
+        set_property(TEST ${test_name} PROPERTY LABELS "test")
+    ENDFOREACH ()
 
 
-if (BENCHMARK_ENABLE_TESTING)
-    include(cmake/CPM.cmake)
-    CPMUsePackageLock(package-lock.cmake)
+    if (BENCHMARK_ENABLE_TESTING)
+        include(cmake/CPM.cmake)
+        CPMUsePackageLock(package-lock.cmake)
 
-    CPMAddPackage( NAME benchmark GITHUB_REPOSITORY google/benchmark VERSION 1.5.2 OPTIONS "BENCHMARK_ENABLE_TESTING Off")
+        CPMAddPackage( NAME benchmark GITHUB_REPOSITORY google/benchmark VERSION 1.5.2 OPTIONS "BENCHMARK_ENABLE_TESTING Off")
 
-    if(benchmark_ADDED)
-        # enable c++11 to avoid compilation errors
-        set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
-    endif()
+        if(TARGET benchmark::benchmark)
+            # enable c++11 to avoid compilation errors
+            set_target_properties(benchmark PROPERTIES CXX_STANDARD 17)
+        endif()
 
-    set(Boost_USE_STATIC_LIBS ON)
-    set(Boost_USE_MULTITHREADED ON)
-    set(Boost_USE_STATIC_RUNTIME OFF)
-    CPMAddPackage( NAME Boost VERSION 1.80.0 GITHUB_REPOSITORY "boostorg/boost" GIT_TAG "boost-1.80.0")
+        set(Boost_USE_STATIC_LIBS ON)
+        set(Boost_USE_MULTITHREADED ON)
+        set(Boost_USE_STATIC_RUNTIME OFF)
+        CPMAddPackage( NAME Boost VERSION 1.80.0 GITHUB_REPOSITORY "boostorg/boost" GIT_TAG "boost-1.80.0")
 
 
-    FILE(GLOB tests ${PROJECT_SOURCE_DIR}/bench/*)
-    FOREACH (test ${tests})
-        get_filename_component(test_name ${test} NAME)
-        message("Adding bench: " ${test_name})
-        add_executable(${test_name} ${PROJECT_SOURCE_DIR}/bench/${test_name})
-        target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
-        target_link_libraries(${test_name} PRIVATE Boost::lockfree)
-        target_link_libraries(${test_name} PRIVATE benchmark::benchmark)
-        target_include_directories(${test_name} PUBLIC ${PROJECT_SOURCE_DIR}/include)
-        add_test(${test_name} ${test_name})
-        set_property(TEST ${test_name} PROPERTY LABELS "bench")
-        list(APPEND ignore_tests ${test_name})
-    ENDFOREACH ()
+        FILE(GLOB tests ${PROJECT_SOURCE_DIR}/bench/*)
+        FOREACH (test ${tests})
+            get_filename_component(test_name ${test} NAME)
+            message("Adding bench: " ${test_name})
+            add_executable(${test_name} ${PROJECT_SOURCE_DIR}/bench/${test_name})
+            target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT})
+            target_link_libraries(${test_name} PRIVATE Boost::lockfree)
+            target_link_libraries(${test_name} PRIVATE benchmark::benchmark)
+            target_link_libraries(${test_name} PRIVATE fastchan)
+            add_test(${test_name} ${test_name})
+            set_property(TEST ${test_name} PROPERTY LABELS "bench")
+            list(APPEND ignore_tests ${test_name})
+        ENDFOREACH ()
 
-    set (CMAKE_CTEST_ARGUMENTS "-L;test")
-    add_custom_target(bench COMMAND ctest -L bench -V)
+        set (CMAKE_CTEST_ARGUMENTS "-L;test")
+        add_custom_target(bench COMMAND ctest -L bench -V)
+    endif()
 endif()
-