Merge pull request #345 from gpospelov/remove-gtest

Remove gtest
gpospelov · Aug 11, 2024 · 964e1f6 · 964e1f6
2 parents 86c9134 + e6dee74
commit 964e1f6
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 42 deletions.
diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
@@ -14,14 +14,12 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with: 
-        submodules: true    
 
     - name: setup dependencies
       run: |
         sudo apt-get update
         sudo apt-get install -y build-essential cmake ccache \
-          cmake qt5-default qttools5-dev libqt5svg5-dev qtdeclarative5-dev libx11-xcb1
+          cmake qt5-default qttools5-dev libqt5svg5-dev qtdeclarative5-dev libx11-xcb1 libgtest-dev
         
     - name: ccache timestamp
       id: ccache_cache_timestamp

diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml
@@ -14,8 +14,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with: 
-        submodules: true    
 
     - name: dependencies
       run: |

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -18,8 +18,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with: 
-        submodules: true    
 
     - name: Install Qt
       uses: jurplel/install-qt-action@v2

diff --git a/.gitmodules b/.gitmodules
diff --git a/README.md b/README.md
@@ -29,13 +29,14 @@ Main features of the framework are:
 ## Requirements
 
 + C++-17
-+ CMake 3.14
-+ Qt 5.12
++ CMake >= 3.14
++ Qt >= 5.12
++ gtest >= 1.10
 
 ## Installation instructions
 
 ```sh
-git clone --recurse-submodules  https://github.com/gpospelov/qt-mvvm.git
+git clone https://github.com/gpospelov/qt-mvvm.git
 mkdir ./build; cd ./build
 cmake ..; make -j8; ctest
 

diff --git a/cmake/modules/CodeTools.cmake b/cmake/modules/CodeTools.cmake
@@ -46,6 +46,17 @@ function(project_testcoverage_setup)
         )
 endfunction()
 
+# Fetches google test version 1.12.1
+function(fetch_googletest)
+  include(FetchContent)
+  FetchContent_Declare(
+    googletest
+    GIT_REPOSITORY https://github.com/google/googletest.git
+    GIT_TAG 58d77fa8070e8cec2dc1ed015d66b454c8d78850)
+FetchContent_MakeAvailable(googletest)
+  message(VERBOSE "GTest binaries are present at ${googletest_BINARY_DIR}")
+endfunction()
+
 # Setups targets for code processing.
 
 function(project_codetools_setup)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,3 +1,15 @@
+enable_testing()
+
+find_package(GTest 1.10 QUIET CONFIG)
+if (NOT GTest_FOUND)
+  message(WARNING "GTest with version >= \"1.10\" was not found, fetching from internet" )
+  fetch_googletest()
+endif()
+find_package_message(
+  GTest_DETAILS
+  "Found GTest: ${GTest_DIR} (version \"${GTest_VERSION}\")"
+  "[${GTest_FOUND}][${GTest_DIR}][v${GTest_VERSION}]")
+
 include(GoogleTest)
 
 if(WIN32)

diff --git a/tests/libtestmachinery/CMakeLists.txt b/tests/libtestmachinery/CMakeLists.txt
@@ -3,12 +3,8 @@ set(library_name testmachinery)
 file(GLOB source_files "*.cpp")
 file(GLOB include_files "*.h")
 
-if(WIN32)
-    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY)
-endif()
-
 add_library(${library_name} STATIC ${source_files} ${include_files})
-target_link_libraries(${library_name} gtest gmock Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_model)
+target_link_libraries(${library_name} PUBLIC GTest::gtest GTest::gmock Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_model)
 target_include_directories(${library_name} PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<BUILD_INTERFACE:${MVVM_AUTOGEN_DIR}>)
 

diff --git a/tests/testintegration/CMakeLists.txt b/tests/testintegration/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 
 set(CMAKE_AUTOMOC ON)
 add_executable(${test} ${source_files} ${include_files})
-target_link_libraries(${test} gtest gmock Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Test mvvm_view testmachinery qcustomplot)
+target_link_libraries(${test} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Test mvvm_view testmachinery qcustomplot)
 
 if (MVVM_DISCOVER_TESTS)
     gtest_discover_tests(${test} TEST_PREFIX "Integration.")

diff --git a/tests/testmodel/CMakeLists.txt b/tests/testmodel/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 
 set(CMAKE_AUTOMOC ON)
 add_executable(${test} ${source_files} ${include_files})
-target_link_libraries(${test} gtest gmock Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_model testmachinery)
+target_link_libraries(${test} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_model testmachinery)
 
 if (MVVM_DISCOVER_TESTS)
     gtest_discover_tests(${test} TEST_PREFIX "Model.")

diff --git a/tests/testview/CMakeLists.txt b/tests/testview/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 
 set(CMAKE_AUTOMOC ON)
 add_executable(${test} ${source_files} ${include_files})
-target_link_libraries(${test} gtest gmock Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_view testmachinery qcustomplot)
+target_link_libraries(${test} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_view testmachinery qcustomplot)
 
 if (MVVM_DISCOVER_TESTS)
     gtest_discover_tests(${test} TEST_PREFIX "View.")

diff --git a/tests/testviewmodel/CMakeLists.txt b/tests/testviewmodel/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
 
 set(CMAKE_AUTOMOC ON)
 add_executable(${test} ${source_files} ${include_files})
-target_link_libraries(${test} gtest gmock Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_viewmodel testmachinery qcustomplot)
+target_link_libraries(${test} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Test mvvm_viewmodel testmachinery qcustomplot)
 
 if (MVVM_DISCOVER_TESTS)
     gtest_discover_tests(${test} TEST_PREFIX "View.")

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -1,4 +1 @@
-if(BUILD_TESTING)
-    add_subdirectory(gtest)
-endif(BUILD_TESTING)
 add_subdirectory(qcustomplot)
diff --git a/thirdparty/gtest/CMakeLists.txt b/thirdparty/gtest/CMakeLists.txt
diff --git a/thirdparty/gtest/googletest b/thirdparty/gtest/googletest