(#283) теперь googletest подтягивается только при сборке TestApp

OnionGrief · Oct 23, 2023 · a8355b4 · a8355b4
1 parent 560bf7d
commit a8355b4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ main" ]
+    branches: [ "main" ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

diff --git a/.github/workflows/unitTests.yml b/.github/workflows/unitTests.yml
@@ -2,9 +2,9 @@ name: UnitTests
 
 on:
   push:
-    branches: [ "*" ]
+    branches: no
   pull_request:
-    branches: [ "*" ]
+    branches: no
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,13 +14,4 @@ add_subdirectory(libs/Interpreter)
 add_subdirectory(libs/InputGenerator)
 add_subdirectory(apps/InterpreterApp)
 add_subdirectory(apps/InputGeneratorApp)
-add_subdirectory(apps/TestsApp)
-
-include(FetchContent)
-FetchContent_Declare(
-  googletest
-  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
-)
-
-set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-FetchContent_MakeAvailable(googletest)
+add_subdirectory(apps/TestsApp)
diff --git a/apps/TestsApp/CMakeLists.txt b/apps/TestsApp/CMakeLists.txt
@@ -2,6 +2,16 @@
 project(TestsApp)
 
 # Create a sources variable with a link to all cpp files to compile
+
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+)
+
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+FetchContent_MakeAvailable(googletest)
+
 set(SOURCES
         src/Example.cpp
         src/main.cpp