Improved build scripts, enabled Example_BasicReactors.

schlangster · schlangster · commit 0741199d334d · 2014-06-03T02:52:25.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,14 +38,3 @@ option(build_tests "Build unit tests?" OFF)
 if(build_tests)
 	add_subdirectory(tests)
 endif()
-
-# cmake -Dbuild_tests=BOOL:ON 
-if(build_tests)   
-	if(DEFINED ENV{GTEST_DIR})
-		message("Using gtest found in $ENV{GTEST_DIR}.")
-	else()
-		message("GTEST_DIR is not defined. You must tell CMake where to find the gtest source.")
-		return()
-	endif()
-	add_subdirectory($ENV{GTEST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gtest)
-endif()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -15,7 +15,15 @@ add_executable(Example_BasicObservers src/BasicObservers.cpp)
 target_link_libraries(Example_BasicObservers CppReact)
 
 ### Example_BasicReactors
-#add_executable(Example_BasicReactors src/BasicReactors.cpp)
+find_package(Boost 1.55 COMPONENTS coroutine context system)
+if(Boost_FOUND)
+	include_directories(${Boost_INCLUDE_DIRS}) 
+	add_executable(Example_BasicReactors src/BasicReactors.cpp)
+	target_link_libraries(Example_BasicReactors CppReact ${Boost_LIBRARIES})
+else()
+	message("boost::coroutine not found. Skipping build of Example_BasicReactors.")
+endif()
+#add_exyecutable(Example_BasicReactors src/BasicReactors.cpp)
 #target_link_libraries(Example_BasicReactors CppReact)
 
 ### Example_BasicSignals
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,3 +1,12 @@
+### Configuration
+if(DEFINED ENV{GTEST_DIR})
+	message("Using gtest found in $ENV{GTEST_DIR}.")
+else()
+	message("GTEST_DIR is not defined. You must tell CMake where to find the gtest source.")
+	return()
+endif()
+add_subdirectory($ENV{GTEST_DIR} ${CMAKE_CURRENT_BINARY_DIR}/gtest)
+
 ### CppReactTest
 add_executable(CppReactTest
 	src/EventStreamTest.cpp
