Snap for 6227608 from 267c95228a017149907e9fd140492ef096bbe96f to r-keystone-qcom-release
Change-Id: I38412ad3e2d349c9686d6f78ab5f152ec9f1ebc0
diff --git a/AUTHORS b/AUTHORS
index 06295c1..89205a1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,6 +33,7 @@
Jern-Kuan Leong <jernkuan@gmail.com>
JianXiong Zhou <zhoujianxiong2@gmail.com>
Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
+Jordan Williams <jwillikers@protonmail.com>
Jussi Knuuttila <jussi.knuuttila@gmail.com>
Kaito Udagawa <umireon@gmail.com>
Kishan Kumar <kumar.kishan@outlook.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cfe125..67c0b70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@
CMP0056 # export EXE_LINKER_FLAGS to try_run
CMP0057 # Support no if() IN_LIST operator
CMP0063 # Honor visibility properties for all targets
+ CMP0077 # Allow option() overrides in importing projects
)
if(POLICY ${p})
cmake_policy(SET ${p} NEW)
@@ -143,8 +144,9 @@
add_cxx_compiler_flag(-Werror RELEASE)
add_cxx_compiler_flag(-Werror RELWITHDEBINFO)
add_cxx_compiler_flag(-Werror MINSIZEREL)
- add_cxx_compiler_flag(-pedantic)
- add_cxx_compiler_flag(-pedantic-errors)
+ # Disabled until googletest (gmock) stops emitting variadic macro warnings
+ #add_cxx_compiler_flag(-pedantic)
+ #add_cxx_compiler_flag(-pedantic-errors)
add_cxx_compiler_flag(-Wshorten-64-to-32)
add_cxx_compiler_flag(-fstrict-aliasing)
# Disable warnings regarding deprecated parts of the library while building
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 04e8aa6..88f7eee 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -50,6 +50,7 @@
JianXiong Zhou <zhoujianxiong2@gmail.com>
Joao Paulo Magalhaes <joaoppmagalhaes@gmail.com>
John Millikin <jmillikin@stripe.com>
+Jordan Williams <jwillikers@protonmail.com>
Jussi Knuuttila <jussi.knuuttila@gmail.com>
Kai Wolf <kai.wolf@gmail.com>
Kaito Udagawa <umireon@gmail.com>
diff --git a/METADATA b/METADATA
index 446c6d4..7405160 100644
--- a/METADATA
+++ b/METADATA
@@ -9,10 +9,10 @@
type: GIT
value: "https://github.com/google/benchmark.git"
}
- version: "5ce2429af7a8481581896afaa480552cc7584808"
+ version: "8982e1ee6aef31e48170400b7d1dc9969b156e5e"
last_upgrade_date {
year: 2020
- month: 1
- day: 8
+ month: 2
+ day: 7
}
}
diff --git a/README.md b/README.md
index d972ab0..560464e 100644
--- a/README.md
+++ b/README.md
@@ -178,8 +178,8 @@
```
To run the benchmark, compile and link against the `benchmark` library
-(libbenchmark.a/.so). If you followed the build steps above, this
-library will be under the build directory you created.
+(libbenchmark.a/.so). If you followed the build steps above, this library will
+be under the build directory you created.
```bash
# Example on linux after running the build steps above. Assumes the
@@ -194,6 +194,26 @@
The compiled executable will run all benchmarks by default. Pass the `--help`
flag for option information or see the guide below.
+### Usage with CMake
+
+If using CMake, it is recommended to link against the project-provided
+`benchmark::benchmark` and `benchmark::benchmark_main` targets using
+`target_link_libraries`.
+It is possible to use ```find_package``` to import an installed version of the
+library.
+```cmake
+find_package(benchmark REQUIRED)
+```
+Alternatively, ```add_subdirectory``` will incorporate the library directly in
+to one's CMake project.
+```cmake
+add_subdirectory(benchmark)
+```
+Either way, link to the library as follows.
+```cmake
+target_link_libraries(MyTarget benchmark::benchmark)
+```
+
## Platform Specific Build Instructions
### Building with GCC
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2650e3d..81c902c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,6 +18,7 @@
endforeach()
add_library(benchmark ${SOURCE_FILES})
+add_library(benchmark::benchmark ALIAS benchmark)
set_target_properties(benchmark PROPERTIES
OUTPUT_NAME "benchmark"
VERSION ${GENERIC_LIB_VERSION}
@@ -55,6 +56,7 @@
# Benchmark main library
add_library(benchmark_main "benchmark_main.cc")
+add_library(benchmark::benchmark_main ALIAS benchmark_main)
set_target_properties(benchmark_main PROPERTIES
OUTPUT_NAME "benchmark_main"
VERSION ${GENERIC_LIB_VERSION}
@@ -64,7 +66,7 @@
target_include_directories(benchmark PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
)
-target_link_libraries(benchmark_main benchmark)
+target_link_libraries(benchmark_main benchmark::benchmark)
set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
diff --git a/src/commandlineflags.cc b/src/commandlineflags.cc
index 4e60f0b..3380a12 100644
--- a/src/commandlineflags.cc
+++ b/src/commandlineflags.cc
@@ -217,8 +217,8 @@
!(v == '0' || v == 'f' || v == 'F' || v == 'n' || v == 'N');
} else if (!value.empty()) {
std::string value_lower(value);
- std::transform(value_lower.begin(), value_lower.end(),
- value_lower.begin(), ::tolower);
+ std::transform(value_lower.begin(), value_lower.end(), value_lower.begin(),
+ [](char c) { return static_cast<char>(::tolower(c)); });
return !(value_lower == "false" || value_lower == "no" ||
value_lower == "off");
} else
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ddcb1a1..0d228b8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -38,17 +38,17 @@
macro(compile_benchmark_test name)
add_executable(${name} "${name}.cc")
- target_link_libraries(${name} benchmark ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(${name} benchmark::benchmark ${CMAKE_THREAD_LIBS_INIT})
endmacro(compile_benchmark_test)
macro(compile_benchmark_test_with_main name)
add_executable(${name} "${name}.cc")
- target_link_libraries(${name} benchmark_main)
+ target_link_libraries(${name} benchmark::benchmark_main)
endmacro(compile_benchmark_test_with_main)
macro(compile_output_test name)
add_executable(${name} "${name}.cc" output_test.h)
- target_link_libraries(${name} output_test_helper benchmark
+ target_link_libraries(${name} output_test_helper benchmark::benchmark
${BENCHMARK_CXX_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
endmacro(compile_output_test)
@@ -148,7 +148,8 @@
compile_benchmark_test(cxx03_test)
set_target_properties(cxx03_test
PROPERTIES
- COMPILE_FLAGS "-std=c++03")
+ CXX_STANDARD 98
+ CXX_STANDARD_REQUIRED YES)
# libstdc++ provides different definitions within <map> between dialects. When
# LTO is enabled and -Werror is specified GCC diagnoses this ODR violation
# causing the test to fail to compile. To prevent this we explicitly disable
@@ -178,7 +179,7 @@
if (BENCHMARK_ENABLE_GTEST_TESTS)
macro(compile_gtest name)
add_executable(${name} "${name}.cc")
- target_link_libraries(${name} benchmark
+ target_link_libraries(${name} benchmark::benchmark
gmock_main ${CMAKE_THREAD_LIBS_INIT})
endmacro(compile_gtest)