summaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorKirk Shoop <kirk.shoop@microsoft.com>2016-02-02 18:56:25 -0800
committerKirk Shoop <kirk.shoop@microsoft.com>2016-02-02 18:56:25 -0800
commit82c5c26c1fa800d29b132977b1bd650fe7dd3520 (patch)
tree99e3e9403b916f4b9500e97b73c552cee6dda003 /projects
parentc0bb57750df4e8d6c0b4555c5cac250447d8b5fa (diff)
parente11b6eb8419ca56ad31ffa2e66657c1a6eb69289 (diff)
downloadRxCpp-82c5c26c1fa800d29b132977b1bd650fe7dd3520.tar.gz
Merge pull request #191 from kirkshoop/distinct
Distinct done and merged! thanks to @gchudnov!
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 8d1fe07..e6f3d68 100644
--- a/projects/CMake/CMakeLists.txt
+++ b/projects/CMake/CMakeLists.txt
@@ -34,6 +34,7 @@ set(RX_SOURCES
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-concat.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-concat_map.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-connect_forever.hpp
+ ${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-distinct.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-distinct_until_changed.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-filter.hpp
${RXCPP_DIR}/Rx/v2/src/rxcpp/operators/rx-finally.hpp
diff --git a/projects/doxygen/CMakeLists.txt b/projects/doxygen/CMakeLists.txt
index 68afdf0..b0ee0a8 100644
--- a/projects/doxygen/CMakeLists.txt
+++ b/projects/doxygen/CMakeLists.txt
@@ -52,6 +52,7 @@ if(DOXYGEN_FOUND)
${DOXY_EXAMPLES_SRC_DIR}/concat_map.cpp
${DOXY_EXAMPLES_SRC_DIR}/create.cpp
${DOXY_EXAMPLES_SRC_DIR}/defer.cpp
+ ${DOXY_EXAMPLES_SRC_DIR}/distinct.cpp
${DOXY_EXAMPLES_SRC_DIR}/distinct_until_changed.cpp
${DOXY_EXAMPLES_SRC_DIR}/empty.cpp
${DOXY_EXAMPLES_SRC_DIR}/error.cpp