Commit dfd9c89b authored by Constantin Pohl's avatar Constantin Pohl
Browse files

minor cleanup, gcc works

parent d7748742
......@@ -46,18 +46,23 @@ option(BUILD_TEST_CASES
ON
)
# Build benchmarks (note: requires to set BUILD_GOOGLE_BEMCH to ON)
option(BUILD_BENCHMARKS
"build benchmarks for pipefabric"
#Build google benchmark library
option(BUILD_GOOGLE_BENCH
"build google benchmark"
ON
)
#Build google benchmark library with test
option(BUILD_GOOGLE_BENCH
"build google benchmark"
# Build benchmark test
option(BUILD_BENCHMARKS
"build benchmarks for pipefabric"
ON
)
# Benchmark test requires benchmark library
if (BUILD_BENCHMARKS)
set(BUILD_GOOGLE_BENCH ON)
endif()
# Force using intel compiler
#include(CMakeForceCompiler)
#CMAKE_FORCE_C_COMPILER(icc "Intel C Compiler")
......@@ -68,10 +73,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wno-deprecated -g -O3
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -Wno-#pragma-messages")
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
# Require at least gcc version 5.4 ("?")
#if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.4)
# message(FATAL_ERROR "GCC version must be at least 5.4!")
#endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -Wno-unused")
elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd488 -wd597")
......
include(../../cmake/Testing.cmake.in)
if (BUILD_BENCHMARKS)
if (BUILD_GOOGLE_BENCH)
do_test(TopologyBenchmarks)
endif()
do_test(TopologyBenchmarks)
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