summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2014-08-27 23:59:12 -0700
committerKirk Shoop <kirk.shoop@microsoft.com>2014-08-28 00:10:08 -0700
commit4b6b5491d28e14b2caca95516bd5c06fd8956d3c (patch)
tree5507c53e5c11ffa56492f62f648f68035c4cc308 /projects
parentebfff78d8e64f67e8e58717c7780bb2f8a8733d2 (diff)
downloadRxCpp-4b6b5491d28e14b2caca95516bd5c06fd8956d3c.tar.gz
update tests to use on.next instead of on.on_next
Diffstat (limited to 'projects')
-rw-r--r--projects/CMake/CMakeLists.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
index 0e71bc4..ae8dd39 100644
--- a/projects/CMake/CMakeLists.txt
+++ b/projects/CMake/CMakeLists.txt
@@ -69,7 +69,7 @@ TARGET_LINK_LIBRARIES(rxcppv2_test ${CMAKE_THREAD_LIBS_INIT})
# define the sources of the self test
set(ONE_SOURCES
${TEST_DIR}/test.cpp
- ${TEST_DIR}/operators/subscribe_on.cpp
+# ${TEST_DIR}/operators/subscribe_on.cpp
)
add_executable(one_test ${ONE_SOURCES})
TARGET_LINK_LIBRARIES(one_test ${CMAKE_THREAD_LIBS_INIT})
@@ -83,13 +83,21 @@ set(PYTHAGORIAN_SOURCES
add_executable(pythagorian ${PYTHAGORIAN_SOURCES})
TARGET_LINK_LIBRARIES(pythagorian ${CMAKE_THREAD_LIBS_INIT})
-# define the sources of the pythagorian example
+# define the sources of the println example
set(PRINTLN_SOURCES
${EXAMPLES_DIR}/println/main.cpp
)
add_executable(println ${PRINTLN_SOURCES})
TARGET_LINK_LIBRARIES(println ${CMAKE_THREAD_LIBS_INIT})
+# define the sources of the tests example
+set(TESTS_EXAMPLE_SOURCES
+ ${EXAMPLES_DIR}/tests/main.cpp
+ ${EXAMPLES_DIR}/tests/take.cpp
+)
+add_executable(tests_example ${TESTS_EXAMPLE_SOURCES})
+TARGET_LINK_LIBRARIES(tests_example ${CMAKE_THREAD_LIBS_INIT})
+
# configure unit tests via CTest
enable_testing()