diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bd1f0f..106ef5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,12 @@ 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. +set(CMAKE_CXX_STANDARD 11) ## compile with C++11 support +set(CMAKE_CXX_STANDARD_REQUIRED ON) + project(phmap VERSION ${DETECTED_PHMAP_VERSION} LANGUAGES CXX) -set(CMAKE_CXX_STANDARD 11) set(PHMAP_HEADERS phmap.h phmap_base.h phmap_bits.h phmap_utils.h phmap_config.h) set(PHMAP_DIR parallel_hashmap) set(CMAKE_SUPPRESS_REGENERATION true) ## suppress ZERO_CHECK project @@ -46,13 +49,6 @@ if (PHMAP_BUILD_TESTS) check_target(gtest_main) check_target(gmock) - list(APPEND ABSL_TEST_COMMON_LIBRARIES - gtest_main - gtest - gmock - ${CMAKE_THREAD_LIBS_INIT} - ) - absl_cc_test( NAME flat_hash_set_test diff --git a/README.md b/README.md index f7f0654..fc09d68 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This repository aims to provide an set of excellent hash map implementations, wi - **Very efficient**, significantly faster than your compiler's unordered map/set or Boost's, or than [sparsepp](https://github.com/greg7mdp/sparsepp) -- **Memory friendly**: low memory usage, although higher that [sparsepp](https://github.com/greg7mdp/sparsepp) +- **Memory friendly**: low memory usage, although a little higher than [sparsepp](https://github.com/greg7mdp/sparsepp) - support heterogeneous lookup @@ -27,7 +27,7 @@ This repository aims to provide an set of excellent hash map implementations, wi Copy the parallel_hashmap directory to your project. That's all. -> The CMakeLists.txt are provided for building the tests and examples. +> cmake configuration files (CMakeLists.txt) are provided for building the tests and examples. ## Example diff --git a/cmake/DownloadGTest.cmake b/cmake/DownloadGTest.cmake index 3c682ae..055270f 100644 --- a/cmake/DownloadGTest.cmake +++ b/cmake/DownloadGTest.cmake @@ -3,23 +3,25 @@ # Download the latest googletest from Github master configure_file( - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in - ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in + ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt ) # Configure and build the downloaded googletest source execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download ) + if(result) - message(FATAL_ERROR "CMake step for googletest failed: ${result}") + message(FATAL_ERROR "CMake step for googletest failed: ${result}") endif() execute_process(COMMAND ${CMAKE_COMMAND} --build . - RESULT_VARIABLE result - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download) + RESULT_VARIABLE result + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download) + if(result) - message(FATAL_ERROR "Build step for googletest failed: ${result}") + message(FATAL_ERROR "Build step for googletest failed: ${result}") endif() # Prevent overriding the parent project's compiler/linker settings on Windows diff --git a/html/img/phmap_logo.png b/html/img/phmap_logo.png new file mode 100644 index 0000000..2331458 Binary files /dev/null and b/html/img/phmap_logo.png differ