From 2800d36e416523e7885e20a5af994fd33e0f21db Mon Sep 17 00:00:00 2001 From: Robert Langlois Date: Tue, 30 Aug 2016 10:44:46 -0700 Subject: [PATCH] Fixed overridden compile flags --- src/tests/interop/CMakeLists.txt | 5 +---- src/tests/interop/metrics/inc/metric_test.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/tests/interop/CMakeLists.txt b/src/tests/interop/CMakeLists.txt index 7de09ce11..338597057 100644 --- a/src/tests/interop/CMakeLists.txt +++ b/src/tests/interop/CMakeLists.txt @@ -53,9 +53,6 @@ add_test(NAME interop_gtests WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/testB if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) endif() -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set_target_properties(interop_gtests PROPERTIES COMPILE_FLAGS "-Wno-unnamed-type-template-args") -endif() if(NOT ENABLE_STATIC) add_custom_command(TARGET interop_gtests POST_BUILD @@ -67,6 +64,6 @@ if(MSVC) elseif(MINGW) set_target_properties(interop_gtests PROPERTIES COMPILE_FLAGS "-Wa,-mbig-obj -Wno-unused-function") elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR CMAKE_COMPILER_IS_GNUCC) - set_target_properties(interop_gtests PROPERTIES COMPILE_FLAGS "-Wno-unused-function") + set_target_properties(interop_gtests PROPERTIES COMPILE_FLAGS "-Wno-unused-function -Wno-unnamed-type-template-args") endif() diff --git a/src/tests/interop/metrics/inc/metric_test.h b/src/tests/interop/metrics/inc/metric_test.h index d1561aa99..9c28090a2 100644 --- a/src/tests/interop/metrics/inc/metric_test.h +++ b/src/tests/interop/metrics/inc/metric_test.h @@ -39,7 +39,7 @@ namespace illumina{ namespace interop { namespace unittest { class metric_test { public: - enum + enum Checks { /** Version of the format */ VERSION=Version,