Skip to content

Commit

Permalink
Clean-up travis and CMakelists
Browse files Browse the repository at this point in the history
- hide install of boost.dispatch in travis log
- some spacing/tabbing issue in CMakelist
  • Loading branch information
ccharly committed Feb 7, 2016
1 parent 069bf53 commit ae2019d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
##===================================================================================================
## Copyright 2015 NumScale SAS
##
## Distributed under the Boost Software License, Version 1.0.
## See accompanying file LICENSE.txt or copy at
## http://www.boost.org/LICENSE_1_0.txt
##===================================================================================================
sudo: false
language: cpp

Expand Down Expand Up @@ -113,6 +120,6 @@ before_script:
# Build unit and run test
script:
- make update.boost-header-only | grep -v "^-- Install" # Silent installation
- make update.boost.dispatch
- make update.boost.dispatch | grep -v "^-- Install" # Silent installation
- make -k unit
- ctest -D Experimental
14 changes: 4 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,13 @@ cmake_minimum_required(VERSION 2.8.7)
project(Boost.SIMD CXX)
set(PROJECT_DOC_DIR ${PROJECT_SOURCE_DIR}/doc)

## Setup target for MSVC
## -------------------------------------------------------------------------------------------------
if(NOT CMAKE_GENERATOR MATCHES "Make|Ninja")
set(CMAKE_CONFIGURATION_TYPES Release Debug SIMDTest SIMDTestDebug SIMDBench CACHE STRING "" FORCE)
endif()

## Requirements for ns.cmake:
## -------------------------------------------------------------------------------------------------
set(NS_CMAKE_GIT_TAG master)
include(cmake/ns.cmake.install.cmake)
if (NOT NS_CMAKE_INSTALLED)
return()
endif()
include(cmake/ns.cmake.install.cmake)
if (NOT NS_CMAKE_INSTALLED)
return()
endif()
include(cmake/ns/ns.cmake)
## -------------------------------------------------------------------------------------------------

Expand Down

0 comments on commit ae2019d

Please sign in to comment.