diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/cpputest/fix-arm-build-error.patch | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/cpputest/fix-arm-build-error.patch')
| -rw-r--r-- | ports/cpputest/fix-arm-build-error.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/ports/cpputest/fix-arm-build-error.patch b/ports/cpputest/fix-arm-build-error.patch new file mode 100644 index 000000000..5b017cb63 --- /dev/null +++ b/ports/cpputest/fix-arm-build-error.patch @@ -0,0 +1,20 @@ +diff --git a/tests/CppUTest/CMakeLists.txt b/tests/CppUTest/CMakeLists.txt
+index 7df07c1..d7317aa 100644
+--- a/tests/CppUTest/CMakeLists.txt
++++ b/tests/CppUTest/CMakeLists.txt
+@@ -56,4 +56,4 @@ add_executable(CppUTestTests ${CppUTestTests_src})
+ cpputest_normalize_test_output_location(CppUTestTests)
+ target_link_libraries(CppUTestTests CppUTest ${THREAD_LIB})
+
+-cpputest_buildtime_discover_tests(CppUTestTests)
++#cpputest_buildtime_discover_tests(CppUTestTests)
+diff --git a/tests/CppUTestExt/CMakeLists.txt b/tests/CppUTestExt/CMakeLists.txt
+index b83ceb2..2abf274 100644
+--- a/tests/CppUTestExt/CMakeLists.txt
++++ b/tests/CppUTestExt/CMakeLists.txt
+@@ -37,4 +37,4 @@ endif (MINGW)
+ add_executable(CppUTestExtTests ${CppUTestExtTests_src})
+ cpputest_normalize_test_output_location(CppUTestExtTests)
+ target_link_libraries(CppUTestExtTests CppUTest CppUTestExt ${THREAD_LIB} ${CPPUNIT_EXTERNAL_LIBRARIES})
+-cpputest_buildtime_discover_tests(CppUTestExtTests)
++#cpputest_buildtime_discover_tests(CppUTestExtTests)
|