diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | MicroBenchmarks/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | MicroBenchmarks/libs/CMakeLists.txt | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b5e8364..43899d54 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,8 +212,7 @@ if(NOT 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 - AND NOT ${subdir} STREQUAL MicroBenchmarks) + if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark) list(APPEND TEST_SUITE_SUBDIRS ${subdir}) endif() endforeach() diff --git a/MicroBenchmarks/CMakeLists.txt b/MicroBenchmarks/CMakeLists.txt index ed67e9d0..0c117a10 100644 --- a/MicroBenchmarks/CMakeLists.txt +++ b/MicroBenchmarks/CMakeLists.txt @@ -1,5 +1,7 @@ -file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +if(NOT DEFINED DISABLE_CXX) + file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -add_subdirectory(libs) -add_subdirectory(XRay) -add_subdirectory(LCALS) + add_subdirectory(libs) + add_subdirectory(XRay) + add_subdirectory(LCALS) +endif() diff --git a/MicroBenchmarks/libs/CMakeLists.txt b/MicroBenchmarks/libs/CMakeLists.txt index a75b9e34..91622d9c 100644 --- a/MicroBenchmarks/libs/CMakeLists.txt +++ b/MicroBenchmarks/libs/CMakeLists.txt @@ -1,3 +1,5 @@ +set(CMAKE_CXX_STANDARD 11) +set(HAVE_STD_REGEX 1) add_subdirectory(benchmark-1.3.0) test_suite_add_build_dependencies(benchmark) test_suite_add_build_dependencies(output_test_helper) |