[rxcpp] disable tests (#27075)

This commit is contained in:
autoantwort 2022-10-03 22:54:36 +02:00 committed by GitHub
parent 146e97610b
commit cf57d2bfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,34 @@
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
index 8856aa42e..2b3d57e97 100755
--- a/projects/CMake/CMakeLists.txt
+++ b/projects/CMake/CMakeLists.txt
@@ -11,18 +11,20 @@ get_filename_component(RXCPP_DIR "${RXCPP_DIR}" PATH)
MESSAGE( STATUS "RXCPP_DIR: " ${RXCPP_DIR} )
-add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test)
+if (NOT ${RXCPP_DISABLE_TESTS_AND_EXAMPLES})
+ add_subdirectory(${RXCPP_DIR}/Rx/v2/test ${CMAKE_CURRENT_BINARY_DIR}/test)
-add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen)
+ add_subdirectory(${RXCPP_DIR}/projects/doxygen ${CMAKE_CURRENT_BINARY_DIR}/projects/doxygen)
-set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples)
+ set(EXAMPLES_DIR ${RXCPP_DIR}/Rx/v2/examples)
-add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep)
-add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop)
-add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes)
-add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println)
-add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian)
-add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests)
+ add_subdirectory(${EXAMPLES_DIR}/cep ${CMAKE_CURRENT_BINARY_DIR}/examples/cep)
+ add_subdirectory(${EXAMPLES_DIR}/stop ${CMAKE_CURRENT_BINARY_DIR}/examples/stop)
+ add_subdirectory(${EXAMPLES_DIR}/linesfrombytes ${CMAKE_CURRENT_BINARY_DIR}/examples/linesfrombytes)
+ add_subdirectory(${EXAMPLES_DIR}/println ${CMAKE_CURRENT_BINARY_DIR}/examples/println)
+ add_subdirectory(${EXAMPLES_DIR}/pythagorian ${CMAKE_CURRENT_BINARY_DIR}/examples/pythagorian)
+ add_subdirectory(${EXAMPLES_DIR}/tests ${CMAKE_CURRENT_BINARY_DIR}/examples/tests)
+endif ()
# The list of RxCpp source files. Please add every new file to this list
set(RX_SOURCES

View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF v4.1.1
SHA512 387e1276151a19b62fd1d36b486ff5f3ed28f0f48ae8b00902bf13464d20603f492ecd63ab4444d04293fc3d92a8f7ce3e67a4c68836415c4655331fb6b54edb
HEAD_REF master
PATCHES
disable-tests.patch # from https://github.com/ReactiveX/RxCpp/pull/574
)
vcpkg_cmake_configure(

View File

@ -1,6 +1,7 @@
{
"name": "rxcpp",
"version": "4.1.1",
"port-version": 1,
"description": "Reactive Extensions for C++",
"homepage": "https://github.com/Reactive-Extensions/RxCpp",
"license": "Apache-2.0",

View File

@ -6566,7 +6566,7 @@
},
"rxcpp": {
"baseline": "4.1.1",
"port-version": 0
"port-version": 1
},
"rxqt": {
"baseline": "bb2138c",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5f127fb83dfe052e029bd2febf1d9e3eac7ab134",
"version": "4.1.1",
"port-version": 1
},
{
"git-tree": "92ae6c5ff3c5a9f81dda630c0b6cc4e69766ee61",
"version": "4.1.1",