at 24.11-pre 62 lines 2.0 kB view raw
1From fbf2ddd872db6a3640bc7d693356b99be9dd70f5 Mon Sep 17 00:00:00 2001 2From: OPNA2608 <christoph.neidahl@gmail.com> 3Date: Thu, 18 Aug 2022 20:12:07 +0200 4Subject: [PATCH] Remove FetchContent usage 5 6--- 7 CMakeLists.txt | 27 +++++---------------------- 8 1 file changed, 5 insertions(+), 22 deletions(-) 9 10diff --git a/CMakeLists.txt b/CMakeLists.txt 11index 84c66a7..5234903 100644 12--- a/CMakeLists.txt 13+++ b/CMakeLists.txt 14@@ -30,20 +30,9 @@ project(Fire VERSION 0.9.9) 15 # or 16 # add_subdirectory(JUCE) # If you've put JUCE in a subdirectory called JUCE 17 18-include(FetchContent) 19-FetchContent_Declare( 20- JUCE 21- GIT_REPOSITORY https://github.com/juce-framework/JUCE.git 22- GIT_TAG 7.0.1 23-) 24-FetchContent_MakeAvailable(JUCE) 25- 26-FetchContent_Declare( 27- readerwriterqueue 28- GIT_REPOSITORY https://github.com/cameron314/readerwriterqueue 29- GIT_TAG v1.0.6 30-) 31-FetchContent_MakeAvailable(readerwriterqueue) 32+add_subdirectory(JUCE EXCLUDE_FROM_ALL) 33+ 34+add_subdirectory(readerwriterqueue EXCLUDE_FROM_ALL) 35 36 # If you are building a VST2 or AAX plugin, CMake needs to be told where to find these SDKs on your 37 # system. This setup should be done before calling `juce_add_plugin`. 38@@ -172,13 +161,7 @@ set(TestFiles 39 test/CatchMain.cpp 40 test/PluginTest.cpp) 41 42-# Download the tagged version of Catch2 43-Include(FetchContent) 44-FetchContent_Declare( 45- Catch2 46- GIT_REPOSITORY https://github.com/catchorg/Catch2.git 47- GIT_TAG v2.13.7) 48-FetchContent_MakeAvailable(Catch2) 49+add_subdirectory(Catch2 EXCLUDE_FROM_ALL) 50 51 # Setup the test executable, again C++ 20 please 52 add_executable(Tests ${TestFiles}) 53@@ -199,4 +182,4 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/test PREFIX "" FILES ${TestFiles}) 54 # We have to manually provide the source directory here for now 55 # https://github.com/catchorg/Catch2/issues/2026 56 include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake) 57-catch_discover_tests(Tests) 58\ No newline at end of file 59+catch_discover_tests(Tests) 60-- 612.36.0 62