Fix configure errors when with FetchContent to fetch dependencies

Author: fbdtemme

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
            cmake -DCMAKE_CXX_COMPILER=g++-10
                  -DCMAKE_BUILD_TYPE=Debug
                  -DBENCODE_BUILD_TESTS=ON
-                 -DBENCODE_BUILD_TESTS_COVERAGE=ON
+                 -DBENCODE_ENABLE_COVERAGE=ON
                  -DBENCODE_BUILD_DOCS=OFF
                  -DBENCODE_BUILD_BENCHMARKS=OFF ..
     - name: build

CMakeLists.txt

@@ -127,15 +127,15 @@ if (BENCODE_ENABLE_INSTALL)
 
 
     if (NOT expected-lite_FOUND)
-        message(STATUS "Adding fmt to install set")
-        install(TARGETS expected
+        message(STATUS "Adding expected-lite to install set")
+        install(TARGETS expected-lite
                 EXPORT ${bencode_targets_export_name}
                 INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()
 
     if (NOT gsl-lite_FOUND)
         message(STATUS "Adding gsl-lite to install set")
-        install(TARGETS gsl::gsl-lite gsl::gsl-lite-v1
+        install(TARGETS gsl-lite-v1
                 EXPORT ${bencode_targets_export_name}
                 INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
     endif()

benchmark/comparison/CMakeLists.txt

@@ -25,5 +25,5 @@ foreach(target "benchmark-fbdtemme-bencode"
 
 endforeach(target)
 
-target_link_libraries(benchmark-arvidn-libtorrent PRIVATE LibtorrentRasterbar::torrent-rasterbar)
+target_link_libraries(benchmark-arvidn-libtorrent PRIVATE torrent-rasterbar)
 

benchmark/comparison/arvidn_libtorrent.cpp

@@ -7,7 +7,7 @@
 
 #include <benchmark/benchmark.h>
 #include <span>
-#include "libtorrent/bdecode.hpp"
+#include <libtorrent/bdecode.hpp>
 
 #include "resources.hpp"
 

external/catch2.cmake

@@ -8,8 +8,7 @@ else()
             Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
             GIT_TAG        v2.x
-            EXCLUDE_FROM_ALL TRUE
     )
     FetchContent_MakeAvailable(Catch2)
-    set(CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/contrib" ${CMAKE_MODULE_PATH})
+    list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/contrib")
 endif()

external/expected-lite.cmake

@@ -9,7 +9,6 @@ else()
             expected-lite
             GIT_REPOSITORY https://github.com/martinmoene/expected-lite.git
             GIT_TAG        master
-            EXCLUDE_FROM_ALL TRUE
     )
     FetchContent_MakeAvailable(expected-lite)
 endif()

external/fmt.cmake

@@ -9,7 +9,6 @@ else()
             fmt
             GIT_REPOSITORY https://github.com/fmtlib/fmt.git
             GIT_TAG        master
-            EXCLUDE_FROM_ALL TRUE
     )
     set(FMT_INSTALL ON)
     set(BUILD_SHARED_LIBS ON)

external/gsl-lite.cmake

@@ -9,8 +9,6 @@ else()
             gsl-lite
             GIT_REPOSITORY https://github.com/gsl-lite/gsl-lite.git
             GIT_TAG        master
-            EXCLUDE_FROM_ALL TRUE
     )
     FetchContent_MakeAvailable(gsl-lite)
-    target_compile_options(gsl::gsl-lite-v1 gsl_CONFIG_DEFAULTS_VERSION 1)
 endif()

external/libtorrent.cmake

@@ -9,8 +9,6 @@ else()
             libtorrent-rasterbar
             GIT_REPOSITORY https://github.com/arvidn/libtorrent.git
             GIT_TAG        RC_2_0
-            EXCLUDE_FROM_ALL TRUE
     )
     FetchContent_MakeAvailable(libtorrent-rasterbar)
-    add_library(LibtorrentRasterbar::torrent-rasterbar ALIAS torrent-rasterbar)
 endif()

tests/CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
 include(../external/catch2.cmake)
-include(../external/expected-lite.cmake)
 
 include(Catch)