Commit 729fc3df authored by Olivier Stasse's avatar Olivier Stasse
Browse files

Merge branch 'olivier-stasse-master'

parents 150f0025 fd9f265c
......@@ -40,12 +40,14 @@ if [ -f /etc/lsb-release ]; then
echo "export DISTRIB_CODENAME="$DISTRIB_CODENAME >> /tmp/local.bash;
echo "export DISTRIB_RELEASE="$DISTRIB_RELEASE >> /tmp/local.bash;
echo "export DISTRIB_DESCRIPTION=\""$DISTRIB_DESCRIPTION\" >> /tmp/local.bash;)
source /tmp/local.bash
. /tmp/local.bash
fi
# Compile and run tests
cd "$build_dir"
if [ $DISTRIB_RELEASE == "14.04" ]; then
if [ "$DISTRIB_RELEASE" = "14.04" ]; then
echo "Build with 14.04"
cmake "$root_dir" -DCMAKE_INSTALL_PREFIX="$install_dir" \
-DCMAKE_CXX_FLAGS="--coverage" \
-DCMAKE_EXE_LINKER_FLAGS="--coverage" \
......@@ -53,13 +55,13 @@ if [ $DISTRIB_RELEASE == "14.04" ]; then
-DCMAKE_INSTALL_PREFIX:STRING="$install_dir"
fi
if [ $DISTRIB_RELEASE == "12.04" ]; then
if [ "$DISTRIB_RELEASE" == "12.04" ]; then
cmake "$root_dir" -DCMAKE_INSTALL_PREFIX="$install_dir" \
-DCMAKE_CXX_FLAGS="--coverage" \
-DCMAKE_EXE_LINKER_FLAGS="--coverage" \
-DCMAKE_INSTALL_PREFIX:STRING="$install_dir"
fi
make soth
make
make test
make install
......@@ -4,6 +4,15 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
IF(UNIX)
INCLUDE(CMakeFindBinUtils)
ENDIF(UNIX)
EXECUTE_PROCESS(COMMAND ${CMAKE_LINKER} -v OUTPUT_VARIABLE LD_VERSION_STR ERROR_VARIABLE LD_VERSION_STR)
MESSAGE("LD_VERSION_STR: ${LD_VERSION_STR}")
STRING(REGEX MATCH "([0-9]+\\.[0-9]+(\\.[0-9]+)?)" LD_VERSION ${LD_VERSION_STR})
MESSAGE("LD_VERSION: ${LD_VERSION}")
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/cpack.cmake)
......@@ -40,11 +49,6 @@ ENDIF(UNIX)
SETUP_PROJECT()
SEARCH_FOR_EIGEN()
EXECUTE_PROCESS(COMMAND ${CMAKE_LINKER} -v OUTPUT_VARIABLE LD_VERSION_STR ERROR_VARIABLE LD_VERSION_STR)
MESSAGE("LD_VERSION_STR: ${LD_VERSION_STR}")
STRING(REGEX MATCH "([0-9]+\\.[0-9]+(\\.[0-9]+)?)" LD_VERSION ${LD_VERSION_STR})
MESSAGE("LD_VERSION: ${LD_VERSION}")
# Handle OS specificities
INCLUDE(CheckIncludeFiles)
CHECK_INCLUDE_FILES("sys/time.h" SYS_TIME_H)
......
soth
====
[![Build Status](https://travis-ci.org/olivier-stasse/soth.png)](https://travis-ci.org/stack-of-tasks/soth)
[![Coverage Status](https://coveralls.io/repos/olivier-stasse/soth/badge.png?branch=master)](https://coveralls.io/r/stack-of-tasks/soth?branch=master)
[![Build Status](https://travis-ci.org/stack-of-tasks/soth.png)](https://travis-ci.org/stack-of-tasks/soth)
[![Coverage Status](https://coveralls.io/repos//stack-of-tasks/soth/badge.png?branch=master)](https://coveralls.io/r/stack-of-tasks/soth?branch=master)
Setup
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment