Commit 1e88581e authored by Florian Oetke's avatar Florian Oetke
Browse files

travis-ci config

parent 26055900
...@@ -6,16 +6,16 @@ ...@@ -6,16 +6,16 @@
if [ $ANALYZE = "true" ]; then if [ $ANALYZE = "true" ]; then
if [ "$CC" = "clang" ]; then if [ "$CC" = "clang" ]; then
docker exec build scan-build cmake -G "Unix Makefiles" -H/repo -B/build docker exec build scan-build cmake -DMIRRAGE_FORCE_LIBCPP=ON -G "Unix Makefiles" -H/repo -B/build
docker exec build scan-build cmake -G "Unix Makefiles" -H/repo -B/build docker exec build scan-build cmake -DMIRRAGE_FORCE_LIBCPP=ON -G "Unix Makefiles" -H/repo -B/build
docker exec build scan-build -enable-checker deadcode.DeadStores \ docker exec build scan-build -enable-checker deadcode.DeadStores \
-enable-checker security.insecureAPI.UncheckedReturn \ -enable-checker security.insecureAPI.UncheckedReturn \
--status-bugs -v \ --status-bugs -v \
cmake --build /build cmake --build /build
fi fi
else else
docker exec build cmake -DSF2_BUILD_TESTS=ON -H/repo -B/build docker exec build cmake -H/repo -B/build
docker exec build cmake -DSF2_BUILD_TESTS=ON -H/repo -B/build docker exec build cmake -H/repo -B/build
docker exec build cmake --build /build docker exec build cmake --build /build
fi fi
...@@ -7,6 +7,10 @@ compiler: ...@@ -7,6 +7,10 @@ compiler:
env: env:
- ANALYZE=false - ANALYZE=false
- ANALYZE=true - ANALYZE=true
matrix:
exclude:
- compiler: gcc
ANALYZE=true
services: services:
- docker - docker
......
...@@ -20,9 +20,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL ...@@ -20,9 +20,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL
endif() endif()
endif() endif()
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") option(MIRRAGE_FORCE_LIBCPP "Force usage of libc++ instead of libstdc++ intependent of the used compiler. " OFF)
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR MIRRAGE_FORCE_LIBCPP)
option(MIRRAGE_USE_LIBCPP "Uses libc++ instead of libstdc++. " ON) option(MIRRAGE_USE_LIBCPP "Uses libc++ instead of libstdc++. " ON)
if(MIRRAGE_USE_LIBCPP) if(MIRRAGE_USE_LIBCPP OR MIRRAGE_FORCE_LIBCPP)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++abi")
endif() endif()
......
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