Unverified Commit 5c25ad3a by Dominic Hamon Committed by GitHub

Ctest support (#1025)

* ctest is now working * Update README * remove commented out lines * Tweaked docs Added note to use parallel and cleaned build config notes * Response to comments * revert all but the readme * make error message clearer * drop --parallel
parent bb978c06
...@@ -76,7 +76,7 @@ $ cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release ../ ...@@ -76,7 +76,7 @@ $ cmake -E chdir "build" cmake -DCMAKE_BUILD_TYPE=Release ../
# or, starting with CMake 3.13, use a simpler form: # or, starting with CMake 3.13, use a simpler form:
# cmake -DCMAKE_BUILD_TYPE=Release -S . -B "build" # cmake -DCMAKE_BUILD_TYPE=Release -S . -B "build"
# Build the library. # Build the library.
$ cmake --build "build" --config Release --parallel $ cmake --build "build" --config Release
``` ```
This builds the `benchmark` and `benchmark_main` libraries and tests. This builds the `benchmark` and `benchmark_main` libraries and tests.
On a unix system, the build directory should now look something like this: On a unix system, the build directory should now look something like this:
...@@ -94,7 +94,7 @@ On a unix system, the build directory should now look something like this: ...@@ -94,7 +94,7 @@ On a unix system, the build directory should now look something like this:
Next, you can run the tests to check the build. Next, you can run the tests to check the build.
```bash ```bash
$ cmake --build "build" --config Release --target test $ cmake -E chdir "build" ctest --build-config Release
``` ```
If you want to install the library globally, also run: If you want to install the library globally, also run:
...@@ -132,7 +132,6 @@ cache variables, if autodetection fails. ...@@ -132,7 +132,6 @@ cache variables, if autodetection fails.
If you are using clang, you may need to set `LLVMAR_EXECUTABLE`, If you are using clang, you may need to set `LLVMAR_EXECUTABLE`,
`LLVMNM_EXECUTABLE` and `LLVMRANLIB_EXECUTABLE` cmake cache variables. `LLVMNM_EXECUTABLE` and `LLVMRANLIB_EXECUTABLE` cmake cache variables.
### Stable and Experimental Library Versions ### Stable and Experimental Library Versions
The main branch contains the latest stable version of the benchmarking library; The main branch contains the latest stable version of the benchmarking library;
......
...@@ -31,7 +31,7 @@ if(EXISTS "${GOOGLETEST_PATH}" AND IS_DIRECTORY "${GOOGLETEST_PATH}" ...@@ -31,7 +31,7 @@ if(EXISTS "${GOOGLETEST_PATH}" AND IS_DIRECTORY "${GOOGLETEST_PATH}"
) )
else() else()
if(NOT ALLOW_DOWNLOADING_GOOGLETEST) if(NOT ALLOW_DOWNLOADING_GOOGLETEST)
message(SEND_ERROR "Did not find Google Test sources! Either pass correct path in GOOGLETEST_PATH, or enable ALLOW_DOWNLOADING_GOOGLETEST, or disable BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.") message(SEND_ERROR "Did not find Google Test sources! Either pass correct path in GOOGLETEST_PATH, or enable BENCHMARK_DOWNLOAD_DEPENDENCIES, or disable BENCHMARK_ENABLE_GTEST_TESTS / BENCHMARK_ENABLE_TESTING.")
else() else()
message(WARNING "Did not find Google Test sources! Fetching from web...") message(WARNING "Did not find Google Test sources! Fetching from web...")
ExternalProject_Add( ExternalProject_Add(
......
Markdown is supported
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