summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2016-03-01 11:39:10 -0800
committerKirk Shoop <kirk.shoop@microsoft.com>2016-03-01 11:39:10 -0800
commit8433dfe942088a572dba79518ba36427921d5b9f (patch)
tree428acf7ce9c8e02f6b153801f673e0f0ef968169 /projects
parentec76ecc0a55c73d35c7cb0944f1563e039583499 (diff)
parent0b3e8b7b47a11d03cf66ce8de57bf1da9108ce3b (diff)
downloadRxCpp-8433dfe942088a572dba79518ba36427921d5b9f.tar.gz
Merge pull request #201 from kirkshoop/pr/200
add sample operator
Diffstat (limited to 'projects')
-rw-r--r--projects/CMake/CMakeLists.txt1
-rw-r--r--projects/doxygen/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt
index 4f299af..cd6f273 100644
--- a/projects/CMake/CMakeLists.txt
+++ b/projects/CMake/CMakeLists.txt
@@ -54,6 +54,7 @@ set(RX_SOURCES
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-repeat.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-replay.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-retry.hpp
+ ${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-sample_time.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-scan.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-skip.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-skip_until.hpp
diff --git a/projects/doxygen/CMakeLists.txt b/projects/doxygen/CMakeLists.txt
index b0ee0a8..f825b43 100644
--- a/projects/doxygen/CMakeLists.txt
+++ b/projects/doxygen/CMakeLists.txt
@@ -77,6 +77,7 @@ if(DOXYGEN_FOUND)
${DOXY_EXAMPLES_SRC_DIR}/repeat.cpp
${DOXY_EXAMPLES_SRC_DIR}/replay.cpp
${DOXY_EXAMPLES_SRC_DIR}/retry.cpp
+ ${DOXY_EXAMPLES_SRC_DIR}/sample.cpp
${DOXY_EXAMPLES_SRC_DIR}/scan.cpp
${DOXY_EXAMPLES_SRC_DIR}/scope.cpp
${DOXY_EXAMPLES_SRC_DIR}/skip.cpp