From eb60b8ac59f9805ae3e1b5a1959d185f3ff1e09a Mon Sep 17 00:00:00 2001 From: greg7mdp Date: Mon, 20 Jun 2022 19:22:05 -0400 Subject: [PATCH] minor cmake updates --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 2 +- CMakeLists.txt | 5 +++-- examples/bench.cc | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 86a472a..22ef267 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,4 +22,4 @@ jobs: CXX: ${{ matrix.compiler }} CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }} run: | - mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && make test + mkdir build && cd build && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && make test diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index c20934b..7d9db26 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -22,4 +22,4 @@ jobs: CXX: ${{ matrix.compiler }} CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }} run: | - mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && make test + mkdir build && cd build && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && make test diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0fb07f7..f86ecc8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,4 +22,4 @@ jobs: CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }} CTEST_OUTPUT_ON_FAILURE: 1 run: | - cmake -Bbuild -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release && cmake --build build --target ALL_BUILD && cmake --build build --target RUN_TESTS + cmake -Bbuild -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release && cmake --build build --target ALL_BUILD && cmake --build build --target RUN_TESTS diff --git a/CMakeLists.txt b/CMakeLists.txt index 272dd1f..74eb568 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") include(DetectVersion) cmake_policy(SET CMP0048 NEW) ## set VERSION as documented by the project() command. +cmake_policy(SET CMP0076 NEW) ## accept new policy set(CMAKE_CXX_STANDARD 11) ## compile with C++11 support set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -44,8 +45,8 @@ export(EXPORT ${PROJECT_NAME}-targets FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake") ## ------------------------- building tests and examples ------------- -option(PHMAP_BUILD_TESTS "Whether or not to build the tests" OFF) -option(PHMAP_BUILD_EXAMPLES "Whether or not to build the examples" OFF) +option(PHMAP_BUILD_TESTS "Whether or not to build the tests" ON) +option(PHMAP_BUILD_EXAMPLES "Whether or not to build the examples" ON) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") diff --git a/examples/bench.cc b/examples/bench.cc index 3c81471..cb5eebe 100644 --- a/examples/bench.cc +++ b/examples/bench.cc @@ -16,7 +16,7 @@ #elif 0 // Abseil's mutexes are very efficient (at least on windows) #include "absl/synchronization/mutex.h" - #define MTX absl::Mutex + #define MTX phmap::AbslMutex #elif 1 #include #if 1