From fd2577881f70adb131090a48210e9af9948979f8 Mon Sep 17 00:00:00 2001 From: Robert Brenick Date: Tue, 26 Mar 2024 11:23:40 +0100 Subject: [PATCH 1/2] Only fetch gtest when building tests --- CMakeLists.txt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d11ef77..b95578f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ execute_process( ) FetchContent_Declare(googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.11.0 + GIT_TAG main ) FetchContent_MakeAvailable(googletest) @@ -70,7 +70,20 @@ install(TARGETS ${ISO22133_TARGET} # Tests # Only build tests if we are on x86_64 and not cross compiling -if ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}")) +if (BUILD_TESTING AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}")) + # Dependencies + include(FetchContent) + execute_process( + COMMAND ping www.github.com -c 1 -q + ERROR_QUIET + RESULT_VARIABLE NO_CONNECTION + ) + FetchContent_Declare(googletest + GIT_REPOSITORY https://github.com/google/googletest.git + GIT_TAG release-1.11.0 + ) + FetchContent_MakeAvailable(googletest) + enable_testing() file(GLOB TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp) add_executable(${ISO22133_TARGET}_test From e9b7f4b4f64d9fa10b4c173654647a63282579b5 Mon Sep 17 00:00:00 2001 From: Robert Brenick Date: Tue, 26 Mar 2024 15:57:53 +0100 Subject: [PATCH 2/2] Update CMakeLists.txt --- CMakeLists.txt | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b95578f..cc1ba48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,20 +4,6 @@ set(CMAKE_C_STANDARD_REQUIRED ON) project(ISO22133 LANGUAGES C CXX) -# Dependencies -include(FetchContent) -execute_process( - COMMAND ping www.github.com -c 1 -q - ERROR_QUIET - RESULT_VARIABLE NO_CONNECTION -) -FetchContent_Declare(googletest - GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG main -) -FetchContent_MakeAvailable(googletest) - - # Swig flags set(WITH_SWIG OFF CACHE BOOL "Enable swigging") set(SWIG_WITH_JAVA OFF CACHE BOOL "Swig to target-language java") @@ -160,4 +146,4 @@ if (WITH_SWIG) else() message(WARNING "SWIG not found") endif() -endif() \ No newline at end of file +endif()