From bf34fff6b4d8980a4ff345dc7b5da1bd214f50aa Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Tue, 27 Feb 2024 17:03:34 +0100 Subject: [PATCH 1/2] cmake: Don't build std_unique_ptr unit tests if CMAKE_CXX_STANDARD is under 14 --- unittest/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt index 06697b157..f5d573773 100644 --- a/unittest/CMakeLists.txt +++ b/unittest/CMakeLists.txt @@ -46,7 +46,10 @@ add_lib_unit_test(std_vector) add_lib_unit_test(std_array) add_lib_unit_test(std_pair) add_lib_unit_test(user_struct) -add_lib_unit_test(std_unique_ptr) + +if(CMAKE_CXX_STANDARD GREATER 14 AND CMAKE_CXX_STANDARD LESS 98) + add_lib_unit_test(std_unique_ptr) +endif() function(config_test test tagname opttype) set(MODNAME ${test}_${tagname}) @@ -137,8 +140,10 @@ add_python_unit_test("py-std-pair" "unittest/python/test_std_pair.py" add_python_unit_test("py-user-struct" "unittest/python/test_user_struct.py" "unittest") -add_python_unit_test("py-std-unique-ptr" - "unittest/python/test_std_unique_ptr.py" "unittest") +if(CMAKE_CXX_STANDARD GREATER 14 AND CMAKE_CXX_STANDARD LESS 98) + add_python_unit_test("py-std-unique-ptr" + "unittest/python/test_std_unique_ptr.py" "unittest") +endif() add_python_unit_test("py-bind-virtual" "unittest/python/test_bind_virtual.py" "unittest") From ef4ac68199689a50099c840bb5bbdbb505e3f6e0 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Tue, 27 Feb 2024 17:22:26 +0100 Subject: [PATCH 2/2] changelog: Add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98526ec07..2efad564b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### Fixed +- Fix unit test build in C++11 ([#442](https://github.com/stack-of-tasks/eigenpy/pull/442)) + ## [3.4.0] - 2024-02-26 ### Added