cpputest: fix patch file related build error
The external component was changed to use git am, but one of the patch
files was not updated to the correct format. This made the build fail at
the patching stage.
Fix the patch file and make the build work again.
Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com>
Change-Id: I6615129eecce23d5d055b4146f6648d451814672
diff --git a/external/CppUTest/0001-cpputest-cmake-fix.patch b/external/CppUTest/0001-Fix-cmake-problems.patch
similarity index 73%
rename from external/CppUTest/0001-cpputest-cmake-fix.patch
rename to external/CppUTest/0001-Fix-cmake-problems.patch
index fb589b7..036f7cf 100644
--- a/external/CppUTest/0001-cpputest-cmake-fix.patch
+++ b/external/CppUTest/0001-Fix-cmake-problems.patch
@@ -1,5 +1,23 @@
+From fd7cafcc94598e7ea77e90fe4851a573e85e41d5 Mon Sep 17 00:00:00 2001
+From: Gyorgy Szing <gyorgy.szing@arm.com>
+Date: Mon, 28 Jul 2025 17:36:54 +0200
+Subject: [PATCH 1/2] Fix cmake problems
+
+- Only export the CppUTestExt target if it exists. This depends on build
+ configuration.
+- Change CPP_PLATFORM to be a cache variable to allow overriding the
+ value form the CMake command line.
+- Do not hardcode the extension of the winmm library on Windows.
+
+Signed-off-by: Gyorgy Szing <gyorgy.szing@arm.com>
+---
+ CMakeLists.txt | 7 ++++++-
+ cmake/Modules/CppUTestConfigurationOptions.cmake | 6 +++---
+ src/CppUTest/CMakeLists.txt | 2 +-
+ 3 files changed, 10 insertions(+), 5 deletions(-)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b1900bb..d9ca865 100644
+index b1900bb3..d9ca865f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,8 +116,13 @@ if(PkgHelpers_AVAILABLE)
@@ -18,7 +36,7 @@
${CMAKE_CURRENT_BINARY_DIR}/CppUTestConfigVersion.cmake
VERSION ${CppUTest_version_major}.${CppUTest_version_minor}
diff --git a/cmake/Modules/CppUTestConfigurationOptions.cmake b/cmake/Modules/CppUTestConfigurationOptions.cmake
-index 634482c..a00b5eb 100644
+index 634482ce..a00b5eb0 100644
--- a/cmake/Modules/CppUTestConfigurationOptions.cmake
+++ b/cmake/Modules/CppUTestConfigurationOptions.cmake
@@ -1,19 +1,19 @@
@@ -45,7 +63,7 @@
include("${CppUTestRootDirectory}/cmake/Modules/CppUTestWarningFlags.cmake")
diff --git a/src/CppUTest/CMakeLists.txt b/src/CppUTest/CMakeLists.txt
-index 736777f..d9a592f 100644
+index 736777f5..d9a592f2 100644
--- a/src/CppUTest/CMakeLists.txt
+++ b/src/CppUTest/CMakeLists.txt
@@ -50,7 +50,7 @@ set(CppUTest_headers
@@ -57,3 +75,6 @@
endif (WIN32)
install(FILES ${CppUTest_headers} DESTINATION include/CppUTest)
install(TARGETS CppUTest
+--
+2.34.1
+
diff --git a/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch b/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
index 8aa9ff2..32a8754 100644
--- a/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
+++ b/external/CppUTest/0002-Fix-cmake-4.0-compatibility.patch
@@ -1,7 +1,7 @@
-From 1147a71cfa5657b13c13d10194d8a5b4c28e1709 Mon Sep 17 00:00:00 2001
+From ad0ea0ad79e9c64516543596669e46968ad89a76 Mon Sep 17 00:00:00 2001
From: Gyorgy Szing <gyorgy.szing@arm.com>
Date: Fri, 18 Jul 2025 12:17:46 +0200
-Subject: [PATCH 1/1] Fix cmake 4.0 compatibility
+Subject: [PATCH 2/2] Fix cmake 4.0 compatibility
Cmake 4.0 dropped compatibility to cmake versions below 3.5. Update the
required version on the cmake file as a workaround.
diff --git a/external/CppUTest/CppUTest.cmake b/external/CppUTest/CppUTest.cmake
index f323ad8..b6fcd6f 100644
--- a/external/CppUTest/CppUTest.cmake
+++ b/external/CppUTest/CppUTest.cmake
@@ -19,7 +19,7 @@
PATCH_COMMAND
git stash
COMMAND git branch -f bf-am
- COMMAND git am ${CMAKE_CURRENT_LIST_DIR}/0001-cpputest-cmake-fix.patch
+ COMMAND git am ${CMAKE_CURRENT_LIST_DIR}/0001-Fix-cmake-problems.patch
COMMAND git am ${CMAKE_CURRENT_LIST_DIR}/0002-Fix-cmake-4.0-compatibility.patch
COMMAND git reset bf-am
)