pyrox.dev
libtins: force C++17 for gtest
+2
-2
pkgs/by-name/li/libtins/0001-force-cpp-14.patch
pkgs/by-name/li/libtins/0001-force-cpp-17.patch
+2
-2
pkgs/by-name/li/libtins/0001-force-cpp-14.patch
pkgs/by-name/li/libtins/0001-force-cpp-17.patch
···
1
-
This change bypasses all the code that attempts to see which C++11 features are enabled in your specific C++11 compiler. C++14 is required for gtest 1.13+.
1
+
This change bypasses all the code that attempts to see which C++11 features are enabled in your specific C++11 compiler. C++17 is required for gtest 1.17+.
2
2
diff --git a/CMakeLists.txt b/CMakeLists.txt
3
3
index 902233e676ee..49ac8a1010a4 100644
4
4
--- a/CMakeLists.txt
···
20
20
- ENDIF()
21
21
+ SET(TINS_HAVE_CXX11 ON)
22
22
+ MESSAGE(STATUS "Using C++11 features")
23
-
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
23
+
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
24
24
ELSE(LIBTINS_ENABLE_CXX11)
25
25
MESSAGE(
26
26
WARNING
+5
-3
pkgs/by-name/li/libtins/package.nix
+5
-3
pkgs/by-name/li/libtins/package.nix
···
21
21
};
22
22
23
23
patches = [
24
-
# Required for gtest 1.13+, see also upstream report at:
25
-
# https://github.com/mfontanini/libtins/issues/529
26
-
./0001-force-cpp-14.patch
24
+
# Required for gtest 1.17+:
25
+
# https://github.com/NixOS/nixpkgs/issues/425358
26
+
# See also an upstream report for gtest 1.13+ and C++14:
27
+
# https://github.com/mfontanini/libtins/issues/
28
+
./0001-force-cpp-17.patch
27
29
];
28
30
29
31
postPatch = ''