From 6a955b3ee0af411576f242f29f6f7a447db480bf Mon Sep 17 00:00:00 2001 From: n0ner Date: Thu, 2 Nov 2023 16:43:49 +0100 Subject: [PATCH 1/3] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5927210..217b48b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ find_package(Threads REQUIRED) # Enable testing include(GoogleTest) enable_testing() -set(GTEST_DIR "${CMAKE_SOURCE_DIR}/googletest/googletest") +set(GTEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest") # Set a default build type if none was specified set(default_build_type "Release") From 24a9de652734e39cef92f66594bdb26992b92743 Mon Sep 17 00:00:00 2001 From: n0ner Date: Thu, 30 Nov 2023 16:24:39 +0100 Subject: [PATCH 2/3] Small tweaks --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 217b48b..b8b1782 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG}") endif() -elseif(CMAKE_BUILD_TYPE MATCHES "Release") +elseif(CMAKE_BUILD_TYPE MATCHES "Release" OR CMAKE_BUILD_TYPE MATCHES "MinSizeRel" OR CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo") set(SANITIZERS_ENABLED 0) add_definitions("-DNDEBUG=1") else() From 8e77a091537828bc6ef62aa63a0c191c938076e5 Mon Sep 17 00:00:00 2001 From: n0ner Date: Wed, 17 Jul 2024 19:36:35 +0200 Subject: [PATCH 3/3] update submodules --- googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/googletest b/googletest index d570769..9ff2450 160000 --- a/googletest +++ b/googletest @@ -1 +1 @@ -Subproject commit d5707695cb020ace53dc35f30dd1c3f463daf98e +Subproject commit 9ff2450a56aed4f7f124f5104d9e3088bf791ee9