diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | projects/CMake/CMakeLists.txt | 5 |
2 files changed, 13 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index d9daf0a..51435aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,10 @@ + language: cpp +os: + - linux + - osx + compiler: - clang @@ -8,9 +13,7 @@ env: - BUILD_TYPE=Release before_install: - - xcode-select --install - - brew update - - brew install cmake + - sh projects/scripts/travis-install.sh install: - cd projects @@ -20,19 +23,17 @@ install: - cd ../.. script: - - cd Build + - cd projects/build - ctest -V - cd .. branches: only: - master + notifications: recipients: - kirk.shoop@microsoft.com email: on_success: change on_failure: always - -os: - - osx diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 7135acc..211c517 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -4,6 +4,8 @@ project(rxcpp) MESSAGE( STATUS "CMAKE_CXX_COMPILER_ID: " ${CMAKE_CXX_COMPILER_ID} ) +FIND_PACKAGE(Threads) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") list( APPEND CMAKE_CXX_FLAGS " -std=c++11 ${CMAKE_CXX_FLAGS}") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") @@ -12,6 +14,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") list( APPEND CMAKE_CXX_FLAGS " /DUNICODE /D_UNICODE /bigobj ${CMAKE_CXX_FLAGS}") endif() + # define some folders get_filename_component(RXCPP_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PATH) get_filename_component(RXCPP_DIR "${RXCPP_DIR}" PATH) @@ -43,12 +46,14 @@ set(TEST_SOURCES ${TEST_DIR}/operators/map.cpp ) add_executable(rxcppv2_test ${TEST_SOURCES}) +TARGET_LINK_LIBRARIES(rxcppv2_test ${CMAKE_THREAD_LIBS_INIT}) # define the sources of the pythagorian example set(PYTHAGORIAN_SOURCES ${EXAMPLES_DIR}/pythagorian/main.cpp ) add_executable(pythagorian ${PYTHAGORIAN_SOURCES}) +TARGET_LINK_LIBRARIES(pythagorian ${CMAKE_THREAD_LIBS_INIT}) # configure unit tests via CTest enable_testing() |