Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -269,11 +269,14 @@ set(TEST_SUITE_SUBDIRS "") foreach(entry ${sub_cmakelists}) get_filename_component(subdir ${entry} DIRECTORY) - # Exclude tools and CTMark from default list - if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark) - list(APPEND TEST_SUITE_SUBDIRS ${subdir}) - endif() + list(APPEND TEST_SUITE_SUBDIRS ${subdir}) endforeach() + # Exclude tools and CTMark from default list + list(REMOVE_ITEM TEST_SUITE_SUBDIRS tools CTMark) + # Exclude Bitcode tests on GCC + if(${CMAKE_C_COMPILR_ID} STREQUAL "GNU") + list(REMOVE_ITEM TEST_SUITE_SUBDIRS Bitcode) + endif() set(TEST_SUITE_SUBDIRS "${TEST_SUITE_SUBDIRS}") endif() set(TEST_SUITE_SUBDIRS "${TEST_SUITE_SUBDIRS}" CACHE STRING Index: MultiSource/Benchmarks/7zip/CMakeLists.txt =================================================================== --- MultiSource/Benchmarks/7zip/CMakeLists.txt +++ MultiSource/Benchmarks/7zip/CMakeLists.txt @@ -1,6 +1,9 @@ set(RUN_OPTIONS b) list(APPEND CFLAGS -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread) -list(APPEND CXXFLAGS -Wno-error=c++11-narrowing -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread) +if(NOT ${CMAKE_C_COMPILR_ID} STREQUAL "GNU") +list(APPEND CXXFLAGS -Wno-error=c++11-narrowing) +endif() +list(APPEND CXXFLAGS -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread) list(APPEND LDFLAGS -lstdc++ -pthread) set(NO_REFERENCE_OUTPUT 1) llvm_multisource(7zip-benchmark