Gtest

.github/workflows/pip.yml

@@ -59,12 +59,12 @@ jobs:
       run: |
         mkdir -p build
         cd build
-        cmake .. -DUNITS_BUILD_SHARED_LIBRARY=ON -DUNITS_BUILD_STATIC_LIBRARY=OFF -DUNITS_INSTALL=ON
+        cmake .. -DBUILD_SHARED_LIBS=ON -DUNITS_INSTALL=ON -DUNITS_ENABLE_TESTS=OFF
         make -j 4
         sudo make install
         cd ..
         python -m pip install pytest
-        pip install -vv -C cmake.define.UNITS_BUILD_SHARED_LIBRARY:BOOL=ON -C cmake.define.UNITS_BUILD_STATIC_LIBRARY:BOOL=OFF .
+        pip install -vv -C cmake.define.BUILD_SHARED_LIBS:BOOL=ON .
 
     - name: Test
       run: |
@@ -91,7 +91,7 @@ jobs:
     - name: Build and install
       run: |
         python -m pip install pytest
-        pip install -vv -C cmake.define.UNITS_BUILD_SHARED_LIBRARY:BOOL=ON -C cmake.define.UNITS_BUILD_STATIC_LIBRARY:BOOL=OFF -C cmake.define.UNITS_PYTHON_INSTALL_SHARED_LIBRARY:BOOL=ON .
+        pip install -vv -C cmake.define.BUILD_SHARED_LIBS:BOOL=ON -C cmake.define.UNITS_PYTHON_INSTALL_SHARED_LIBRARY:BOOL=ON .
 
     - name: Test
       run: python -m pytest ./test/python

CMakeLists.txt

@@ -211,16 +211,36 @@ add_subdirectory(units)
 if(UNITS_BUILD_FUZZ_TARGETS)
     add_subdirectory(FuzzTargets)
 elseif(UNITS_ENABLE_TESTS AND NOT CMAKE_VERSION VERSION_LESS 3.13)
-    include(updateGitSubmodules)
-    if(UNITS_ENABLE_SUBMODULE_UPDATE)
-        enable_testing()
-        if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/googletest/CMakeLists.txt")
-            submod_update(ThirdParty/googletest)
-        endif()
-    else()
+    enable_testing()
+    option(
+        UNITS_USE_EXTERNAL_GTEST
+        "use an installed or external version of GTest instead of the included submodule"
+        OFF
+    )
+    mark_as_advanced(UNITS_USE_EXTERNAL_GTEST)
+
+    if(UNITS_USE_EXTERNAL_GTEST)
         include(FindPkgConfig)
         find_package(GTest REQUIRED)
         pkg_check_modules(GMock gmock REQUIRED)
+    else()
+        if(NOT EXISTS "${PROJECT_SOURCE_DIR}/ThirdParty/googletest/CMakeLists.txt")
+            include(updateGitSubmodules)
+            if(${UNITS_CMAKE_PROJECT_NAME}_ENABLE_SUBMODULE_UPDATE)
+                submod_update(ThirdParty/googletest)
+            else()
+                include(FindPkgConfig)
+                find_package(GTest REQUIRED)
+                pkg_check_modules(GMock gmock REQUIRED)
+                if(NOT GTest_FOUND)
+                    message(
+                        ERROR
+                        "GTest not found, and submodule not found and unable to update install gtest or enable submodule updating to build a local copy of gtest"
+                    )
+                endif()
+            endif()
+        endif()
+
     endif()
     if(BUILD_TESTING)
         add_subdirectory(test)

azure-pipelines.yml

@@ -32,14 +32,28 @@ jobs:
       - script: git diff --exit-code --color
         displayName: Check tidy
 
-  - job: Native
+  - job: Native_gtest
     strategy:
       matrix:
         Linux14:
           vmImage: 'ubuntu-latest'
+          units.options: -DUNITS_USE_EXTERNAL_GTEST=ON
         Linux14shared:
           vmImage: 'ubuntu-latest'
-          units.options: -DUNITS_BUILD_SHARED_LBIRARY=ON
+          units.options: -DBUILD_SHARED_LIBS=ON -DUNITS_USE_EXTERNAL_GTEST=ON
+    pool:
+      vmImage: $(vmImage)
+    steps:
+      - script: |
+          sudo apt-get update -qq -y  # It's good practice to update before installing
+          sudo apt-get install -qq -y libgtest-dev libgmock-dev
+        displayName: 'Install gtest' # Optional: Add a display name for the step
+      - template: .ci/azure-build.yml
+      - template: .ci/azure-test.yml
+
+  - job: Native
+    strategy:
+      matrix:
         macOS17:
           vmImage: 'macOS-latest'
           units.std: 17
@@ -48,7 +62,7 @@ jobs:
           units.std: 11
         Windows17:
           vmImage: 'windows-2019'
-          units.options: -DUNITS_BUILD_SHARED_LBIRARY=ON
+          units.options: -DUNITS_BUILD_SHARED_LIBRARY=ON -DUNITS_BUILD_STATIC_LIBRARY=OFF
           units.std: 17
         Windows32bit:
           vmImage: 'windows-2019'

config/AddGoogletest.cmake

@@ -11,31 +11,34 @@
 # Add make check, as well, which gives output on failed tests without having to set an
 # environment variable.
 #
+
 include(extraMacros)
-set(CMAKE_WARN_DEPRECATED
-    OFF
-    CACHE INTERNAL "" FORCE
-)
-set(gtest_force_shared_crt
-    ON
-    CACHE INTERNAL ""
-)
-
-set(BUILD_SHARED_LIBS
-    OFF
-    CACHE INTERNAL ""
-)
-set(HAVE_STD_REGEX
-    ON
-    CACHE INTERNAL ""
-)
-
-set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS
-    1
-    CACHE INTERNAL ""
-)
-
-if(NOT GTest_FOUND)
+
+if(NOT UNITS_USE_EXTERNAL_GTEST AND NOT GTest_FOUND)
+
+    set(CMAKE_WARN_DEPRECATED
+        OFF
+        CACHE INTERNAL "" FORCE
+    )
+    set(gtest_force_shared_crt
+        ON
+        CACHE INTERNAL ""
+    )
+
+    set(BUILD_SHARED_LIBS
+        OFF
+        CACHE INTERNAL ""
+    )
+    set(HAVE_STD_REGEX
+        ON
+        CACHE INTERNAL ""
+    )
+
+    set(CMAKE_SUPPRESS_DEVELOPER_WARNINGS
+        1
+        CACHE INTERNAL ""
+    )
+
     add_subdirectory(
         ${CMAKE_SOURCE_DIR}/ThirdParty/googletest
         ${CMAKE_BINARY_DIR}/ThirdParty/googletest EXCLUDE_FROM_ALL
@@ -55,6 +58,36 @@ if(NOT GTest_FOUND)
             gmock_main PUBLIC "-Wno-undef" "-Wno-c++17-attribute-extensions"
         )
     endif()
+
+    hide_variable(gmock_build_tests)
+    hide_variable(gtest_build_samples)
+    hide_variable(gtest_build_tests)
+    hide_variable(gtest_disable_pthreads)
+    hide_variable(gtest_hide_internal_symbols)
+    hide_variable(BUILD_GMOCK)
+    hide_variable(BUILD_GTEST)
+    hide_variable(INSTALL_GTEST)
+    hide_variable(GTEST_HAS_ABSL)
+
+    set_target_properties(gtest gtest_main gmock gmock_main PROPERTIES FOLDER "Extern")
+
+    if(MSVC)
+        # add_compile_options( /wd4459)
+        if(MSVC_VERSION GREATER_EQUAL 1900)
+            target_compile_definitions(
+                gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+            )
+            target_compile_definitions(
+                gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+            )
+            target_compile_definitions(
+                gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+            )
+            target_compile_definitions(
+                gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+            )
+        endif()
+    endif()
 endif()
 
 if(GOOGLE_TEST_INDIVIDUAL)
@@ -85,35 +118,3 @@ macro(add_gtest TESTNAME)
     endif()
 
 endmacro()
-
-hide_variable(gmock_build_tests)
-hide_variable(gtest_build_samples)
-hide_variable(gtest_build_tests)
-hide_variable(gtest_disable_pthreads)
-hide_variable(gtest_hide_internal_symbols)
-hide_variable(BUILD_GMOCK)
-hide_variable(BUILD_GTEST)
-hide_variable(INSTALL_GTEST)
-hide_variable(GTEST_HAS_ABSL)
-
-if(NOT GTest_FOUND)
-    set_target_properties(gtest gtest_main gmock gmock_main PROPERTIES FOLDER "Extern")
-endif()
-
-if(MSVC)
-    # add_compile_options( /wd4459)
-    if(MSVC_VERSION GREATER_EQUAL 1900)
-        target_compile_definitions(
-            gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-        )
-        target_compile_definitions(
-            gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-        )
-        target_compile_definitions(
-            gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-        )
-        target_compile_definitions(
-            gmock_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
-        )
-    endif()
-endif()