🔧 ⬆️ cmake:3.5, gtest:v1.16.0,

kris-jusiak · kris-jusiak · commit 3ecb029f734d · 2025-04-02T12:18:43.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@
 # (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 #
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.5)
 project(GUnit CXX)
 
 set(MASTER_PROJECT OFF)
diff --git a/libs/gherkin-cpp b/libs/gherkin-cpp
@@ -1 +1 @@
-Subproject commit 88f6249838fde7b0395082ed6401c0b74124b1a8
+Subproject commit 5248145893c8cf32e691276feb4eb21f0f46d570
diff --git a/libs/googletest b/libs/googletest
@@ -1 +1 @@
-Subproject commit f8d7d77c06936315286eb55f8de22cd23c188571
+Subproject commit 6910c9d9165801d8827d628cb72eb7ea9dd538c5
diff --git a/libs/json b/libs/json
@@ -1 +1 @@
-Subproject commit 4f8fba14066156b73f1189a2b8bd568bde5284c5
+Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
diff --git a/test/Detail/ProgUtils.cpp b/test/Detail/ProgUtils.cpp
@@ -29,6 +29,7 @@ TEST(ProgUtils, ShouldReturnProgFullPath) {
 }
 #endif
 
+#if GUNIT_SHOW_STACK_SIZE > 1
 TEST(ProgUtils, ShouldReturnCallStack) {
   EXPECT_EQ(std::string{}, call_stack("\n", 0, 0));
   EXPECT_EQ(std::string{}, call_stack("\n", 1, 0));
@@ -39,6 +40,7 @@ TEST(ProgUtils, ShouldReturnCallStack) {
       call_stack("\n", 1, 2),
       testing::MatchesRegex(".*ProgUtils_ShouldReturnCallStack_Test.*"));
 }
+#endif
 
 }  // detail
 }  // v1

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# (See accompanying file LICENSE_1_0.txt or copy at`
`6`	`6`	`# http://www.boost.org/LICENSE_1_0.txt)`
`7`	`7`	`#`
`8`		`-cmake_minimum_required(VERSION 2.8.12)`
	`8`	`+cmake_minimum_required(VERSION 3.5)`
`9`	`9`	`project(GUnit CXX)`
`10`	`10`
`11`	`11`	`set(MASTER_PROJECT OFF)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ TEST(ProgUtils, ShouldReturnProgFullPath) {`
`29`	`29`	`}`
`30`	`30`	`#endif`
`31`	`31`
	`32`	`+#if GUNIT_SHOW_STACK_SIZE > 1`
`32`	`33`	`TEST(ProgUtils, ShouldReturnCallStack) {`
`33`	`34`	`EXPECT_EQ(std::string{}, call_stack("\n", 0, 0));`
`34`	`35`	`EXPECT_EQ(std::string{}, call_stack("\n", 1, 0));`
`@@ -39,6 +40,7 @@ TEST(ProgUtils, ShouldReturnCallStack) {`
`39`	`40`	`call_stack("\n", 1, 2),`
`40`	`41`	`testing::MatchesRegex(".ProgUtils_ShouldReturnCallStack_Test."));`
`41`	`42`	`}`
	`43`	`+#endif`
`42`	`44`
`43`	`45`	`} // detail`
`44`	`46`	`} // v1`