From 705dea071e6bbc936a92633ba5bacce6789c8088 Mon Sep 17 00:00:00 2001 From: Erik Rigtorp Date: Sat, 14 Nov 2026 12:07:58 -0500 Subject: [PATCH] Modernize and simplify CMake build and CI --- .github/workflows/ccpp.yml | 72 ------------ .github/workflows/ci.yml | 16 +++ .gitignore | 3 +- CMakeLists.txt | 171 ++++++++++++++-------------- CMakePresets.json | 71 ++++++++++++ README.md | 13 +-- cmake/HashMapConfig.cmake.in | 4 - src/HashMapBenchmark.cpp | 13 ++- src/HashMapExample.cpp | 6 +- src/HashMapTest.cpp | 21 ++-- tests/cmake/check.cmake | 44 ------- tests/cmake/consumer/CMakeLists.txt | 28 ----- tests/cmake/consumer/main.cpp | 9 -- 13 files changed, 198 insertions(+), 273 deletions(-) delete mode 100644 .github/workflows/ccpp.yml create mode 100644 .github/workflows/ci.yml create mode 100644 CMakePresets.json delete mode 100644 cmake/HashMapConfig.cmake.in delete mode 100644 tests/cmake/check.cmake delete mode 100644 tests/cmake/consumer/CMakeLists.txt delete mode 100644 tests/cmake/consumer/main.cpp diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml deleted file mode 100644 index 89fd2af..0000000 --- a/.github/workflows/ccpp.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: C/C++ CI - -on: - push: - branches: [master] - pull_request: - workflow_dispatch: - -permissions: - contents: read - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - build: - name: Build (${{ matrix.name }}) - runs-on: ${{ matrix.os }} - timeout-minutes: 15 - strategy: - fail-fast: false - matrix: - include: - - name: Linux GCC - os: ubuntu-latest - compiler: g++ - flags: -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer - - name: Linux Clang - os: ubuntu-latest - compiler: clang++ - flags: -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer - - name: macOS Clang - os: macos-latest - compiler: clang++ - flags: -O1 -g -fsanitize=address,undefined -fno-omit-frame-pointer - - name: Windows MSVC - os: windows-latest - compiler: cl - flags: '' - env: - CXX: ${{ matrix.compiler }} - HASHMAP_CXX_FLAGS: ${{ matrix.flags }} - defaults: - run: - shell: bash - steps: - - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - with: - persist-credentials: false - - name: Configure - run: | - cmake_args=() - if [[ "$RUNNER_OS" != Windows ]]; then - cmake_args+=("-DCMAKE_BUILD_TYPE=Debug") - fi - if [[ -n "$HASHMAP_CXX_FLAGS" ]]; then - cmake_args+=("-DCMAKE_CXX_FLAGS=$HASHMAP_CXX_FLAGS") - fi - cmake -S . -B build \ - -DCMAKE_CXX_STANDARD=14 \ - -DHASHMAP_WARNINGS_AS_ERRORS=ON \ - "${cmake_args[@]}" - - name: Build - run: cmake --build build --config Debug --parallel 2 - - name: Test - run: ctest --test-dir build -C Debug --output-on-failure - - name: Check CMake consumers and package relocation - run: >- - cmake -DHASHMAP_SOURCE_DIR="$GITHUB_WORKSPACE" - -DHASHMAP_CHECK_DIR="$RUNNER_TEMP/hashmap-package-check" - -P tests/cmake/check.cmake diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..13dbce4 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: + push: + branches: [master, main] + pull_request: + +jobs: + ci: + uses: rigtorp/.github/.github/workflows/cpp-ci.yml@master + with: + cxx-standards: '["14", "17", "20"]' + run-sanitizers: true + enable-windows: true + enable-macos: true + warnings-as-errors: true diff --git a/.gitignore b/.gitignore index aa3d14c..6ff7d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .idea/ .vscode/ build/ -cmake-build-* \ No newline at end of file +cmake-build-* +CMakeUserPresets.json \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index d0f4583..e53db20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,111 +1,106 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24...4.3) -project(HashMap VERSION 1.0.0 LANGUAGES CXX) - -include(GNUInstallDirs) -include(CMakePackageConfigHelpers) - -set(HASHMAP_TOP_LEVEL OFF) -if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) - set(HASHMAP_TOP_LEVEL ON) -endif() - -option(HASHMAP_BUILD_TESTS "Build HashMap tests" ${HASHMAP_TOP_LEVEL}) -option(HASHMAP_BUILD_EXAMPLES "Build HashMap examples" ${HASHMAP_TOP_LEVEL}) -set(HASHMAP_BENCHMARK_DEFAULT ${HASHMAP_TOP_LEVEL}) -if(WIN32) - set(HASHMAP_BENCHMARK_DEFAULT OFF) -endif() -option(HASHMAP_BUILD_BENCHMARKS "Build the POSIX benchmark" ${HASHMAP_BENCHMARK_DEFAULT}) -option(HASHMAP_INSTALL "Generate HashMap install rules" ${HASHMAP_TOP_LEVEL}) -option(HASHMAP_WARNINGS_AS_ERRORS "Treat HashMap executable warnings as errors" OFF) +project(HashMap + VERSION 1.0.0 + HOMEPAGE_URL "https://github.com/rigtorp/HashMap" + LANGUAGES CXX +) +# ----------------------------------------------------------------------------- +# Library Target +# ----------------------------------------------------------------------------- add_library(HashMap INTERFACE) add_library(HashMap::HashMap ALIAS HashMap) target_compile_features(HashMap INTERFACE cxx_std_14) -target_include_directories(HashMap INTERFACE - "$" - "$") +target_sources(HashMap INTERFACE + FILE_SET HEADERS + BASE_DIRS include + FILES include/rigtorp/HashMap.h +) + +# ----------------------------------------------------------------------------- +# Tests, Examples & Benchmarks (Top-Level Only) +# ----------------------------------------------------------------------------- +include(CTest) -function(hashmap_executable target source) +if(PROJECT_IS_TOP_LEVEL AND BUILD_TESTING) + function(hashmap_executable target source) add_executable(${target} ${source}) target_link_libraries(${target} PRIVATE HashMap::HashMap) - set_target_properties(${target} PROPERTIES CXX_EXTENSIONS OFF) - if(MSVC) - target_compile_options(${target} PRIVATE /permissive- /W4) - if(HASHMAP_WARNINGS_AS_ERRORS) - target_compile_options(${target} PRIVATE /WX) - endif() - elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(${target} PRIVATE -Wall -Wextra -Wpedantic) - if(HASHMAP_WARNINGS_AS_ERRORS) - target_compile_options(${target} PRIVATE -Werror) - endif() - endif() -endfunction() - -if(HASHMAP_BUILD_TESTS) - include(CTest) - if(BUILD_TESTING) - hashmap_executable(HashMapTest src/HashMapTest.cpp) - add_test(NAME HashMapTest COMMAND HashMapTest) - endif() -endif() + set_target_properties(${target} PROPERTIES + CXX_EXTENSIONS OFF + COMPILE_WARNING_AS_ERROR ON + ) + target_compile_options(${target} PRIVATE + "$<$:/permissive-;/W4;/w14242>" + "$<$:-Wall;-Wextra;-Wpedantic;-Wshadow;-Wconversion;-Wsign-conversion;-Wold-style-cast;-Wundef>" + ) + endfunction() -if(HASHMAP_BUILD_EXAMPLES) - hashmap_executable(HashMapExample src/HashMapExample.cpp) -endif() + hashmap_executable(HashMapExample src/HashMapExample.cpp) -if(HASHMAP_BUILD_BENCHMARKS) - if(WIN32) - message(FATAL_ERROR "HashMapBenchmark requires POSIX; disable HASHMAP_BUILD_BENCHMARKS on Windows") - endif() + hashmap_executable(HashMapTest src/HashMapTest.cpp) + add_test(NAME HashMapTest COMMAND HashMapTest) - option(HASHMAP_BENCHMARK_WITH_ABSL "Use installed Abseil when available" ON) - option(HASHMAP_BENCHMARK_WITH_SPARSEHASH "Use installed sparsehash when available" ON) + if(NOT WIN32) hashmap_executable(HashMapBenchmark src/HashMapBenchmark.cpp) target_compile_features(HashMapBenchmark PRIVATE cxx_std_17) if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64|amd64)$") - target_compile_options(HashMapBenchmark PRIVATE -msse4.2) + target_compile_options(HashMapBenchmark PRIVATE -msse4.2) endif() + option(HASHMAP_BENCHMARK_WITH_ABSL "Use installed Abseil when available" ON) if(HASHMAP_BENCHMARK_WITH_ABSL) - find_package(absl CONFIG QUIET) - if(TARGET absl::flat_hash_map) - target_link_libraries(HashMapBenchmark PRIVATE absl::flat_hash_map) - target_compile_definitions(HashMapBenchmark PRIVATE HASHMAP_BENCHMARK_HAS_ABSL) - endif() + find_package(absl CONFIG QUIET) + if(TARGET absl::flat_hash_map) + target_link_libraries(HashMapBenchmark PRIVATE absl::flat_hash_map) + target_compile_definitions(HashMapBenchmark PRIVATE HASHMAP_BENCHMARK_HAS_ABSL) + endif() endif() + + option(HASHMAP_BENCHMARK_WITH_SPARSEHASH "Use installed sparsehash when available" ON) if(HASHMAP_BENCHMARK_WITH_SPARSEHASH) - find_path(HASHMAP_SPARSEHASH_INCLUDE_DIR NAMES google/dense_hash_map) - mark_as_advanced(HASHMAP_SPARSEHASH_INCLUDE_DIR) - if(HASHMAP_SPARSEHASH_INCLUDE_DIR) - target_include_directories(HashMapBenchmark SYSTEM PRIVATE "${HASHMAP_SPARSEHASH_INCLUDE_DIR}") - target_compile_definitions(HashMapBenchmark PRIVATE HASHMAP_BENCHMARK_HAS_SPARSEHASH) - endif() - endif() - if(HASHMAP_BUILD_TESTS AND BUILD_TESTING) - add_test(NAME HashMapBenchmarkSmoke COMMAND HashMapBenchmark -t 4 -c 1000 -i 1000) + find_path(HASHMAP_SPARSEHASH_INCLUDE_DIR NAMES google/dense_hash_map) + mark_as_advanced(HASHMAP_SPARSEHASH_INCLUDE_DIR) + if(HASHMAP_SPARSEHASH_INCLUDE_DIR) + target_include_directories(HashMapBenchmark SYSTEM PRIVATE "${HASHMAP_SPARSEHASH_INCLUDE_DIR}") + target_compile_definitions(HashMapBenchmark PRIVATE HASHMAP_BENCHMARK_HAS_SPARSEHASH) + endif() endif() + + add_test(NAME HashMapBenchmarkSmoke COMMAND HashMapBenchmark -t 4 -c 1000 -i 1000) + endif() endif() -if(HASHMAP_INSTALL) - set(HASHMAP_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/HashMap") - configure_package_config_file(cmake/HashMapConfig.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/HashMapConfig.cmake" - INSTALL_DESTINATION "${HASHMAP_INSTALL_CMAKEDIR}") - write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/HashMapConfigVersion.cmake" - VERSION ${PROJECT_VERSION} - COMPATIBILITY SameMajorVersion - ARCH_INDEPENDENT) - - install(TARGETS HashMap EXPORT HashMapTargets) - install(DIRECTORY include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - install(EXPORT HashMapTargets FILE HashMapTargets.cmake - NAMESPACE HashMap:: DESTINATION "${HASHMAP_INSTALL_CMAKEDIR}") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/HashMapConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/HashMapConfigVersion.cmake" - DESTINATION "${HASHMAP_INSTALL_CMAKEDIR}") - export(EXPORT HashMapTargets FILE "${CMAKE_CURRENT_BINARY_DIR}/HashMapTargets.cmake" - NAMESPACE HashMap::) +# ----------------------------------------------------------------------------- +# Installation & Package Export +# ----------------------------------------------------------------------------- +if(PROJECT_IS_TOP_LEVEL) + include(GNUInstallDirs) + include(CMakePackageConfigHelpers) + + export( + TARGETS HashMap + NAMESPACE HashMap:: + FILE HashMapConfig.cmake + ) + + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/HashMapConfigVersion.cmake" + COMPATIBILITY SameMajorVersion + ARCH_INDEPENDENT + ) + + install(TARGETS HashMap EXPORT HashMapConfig FILE_SET HEADERS) + + install( + EXPORT HashMapConfig + NAMESPACE HashMap:: + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/HashMap" + ) + + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/HashMapConfigVersion.cmake" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/HashMap" + ) endif() diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..653a92a --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,71 @@ +{ + "version": 3, + "cmakeMinimumRequired": { + "major": 3, + "minor": 24, + "patch": 0 + }, + "configurePresets": [ + { + "name": "base", + "hidden": true, + "binaryDir": "${sourceDir}/build/${presetName}", + "cacheVariables": { + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "debug", + "displayName": "Debug", + "inherits": "base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + } + }, + { + "name": "release", + "displayName": "Release", + "inherits": "base", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "asan", + "displayName": "Debug (ASan + UBSan)", + "inherits": "debug", + "cacheVariables": { + "CMAKE_CXX_FLAGS": "-fsanitize=address,undefined -fno-omit-frame-pointer" + } + }, + { + "name": "tsan", + "displayName": "Debug (TSan)", + "inherits": "debug", + "cacheVariables": { + "CMAKE_CXX_FLAGS": "-fsanitize=thread -fno-omit-frame-pointer" + } + } + ], + "buildPresets": [ + { + "name": "base", + "hidden": true + }, + { "name": "debug", "inherits": "base", "configurePreset": "debug" }, + { "name": "release", "inherits": "base", "configurePreset": "release" }, + { "name": "asan", "inherits": "base", "configurePreset": "asan" }, + { "name": "tsan", "inherits": "base", "configurePreset": "tsan" } + ], + "testPresets": [ + { + "name": "base", + "hidden": true, + "output": { "outputOnFailure": true } + }, + { "name": "debug", "inherits": "base", "configurePreset": "debug" }, + { "name": "release", "inherits": "base", "configurePreset": "release" }, + { "name": "asan", "inherits": "base", "configurePreset": "asan" }, + { "name": "tsan", "inherits": "base", "configurePreset": "tsan" } + ] +} diff --git a/README.md b/README.md index afaefc2..e7b64a4 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,7 @@ The rest of the member functions are implemented as for ## Build and install The header-only `HashMap::HashMap` CMake target requires C++14. Configure with -CMake 3.20 or newer: +CMake 3.24 or newer: ```sh cmake -S . -B build -DCMAKE_BUILD_TYPE=Release @@ -89,15 +89,8 @@ cmake --install build --prefix /path/to/install ``` Standalone builds enable tests and examples, plus the benchmark on Linux and -macOS. These are disabled by default when included with `add_subdirectory`. - -| CMake option | Standalone default | Purpose | -| --- | --- | --- | -| `HASHMAP_BUILD_TESTS` | `ON` | Build tests when `BUILD_TESTING` is also enabled | -| `HASHMAP_BUILD_EXAMPLES` | `ON` | Build the example | -| `HASHMAP_BUILD_BENCHMARKS` | `ON` on POSIX, `OFF` on Windows | Build the benchmark | -| `HASHMAP_INSTALL` | `ON` | Generate installation and package files | -| `HASHMAP_WARNINGS_AS_ERRORS` | `OFF` | Treat warnings in project executables as errors | +macOS. These are disabled by default when included with `add_subdirectory` or +when `BUILD_TESTING=OFF`. To consume an installed package: diff --git a/cmake/HashMapConfig.cmake.in b/cmake/HashMapConfig.cmake.in deleted file mode 100644 index da72e6a..0000000 --- a/cmake/HashMapConfig.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -@PACKAGE_INIT@ - -include("${CMAKE_CURRENT_LIST_DIR}/HashMapTargets.cmake") -check_required_components(HashMap) diff --git a/src/HashMapBenchmark.cpp b/src/HashMapBenchmark.cpp index af67ede..8267e66 100644 --- a/src/HashMapBenchmark.cpp +++ b/src/HashMapBenchmark.cpp @@ -86,10 +86,10 @@ int main(int argc, char *argv[]) { while ((opt = getopt(argc, argv, "i:c:t:")) != -1) { switch (opt) { case 'i': - iters = std::stol(optarg); + iters = std::stoul(optarg); break; case 'c': - count = std::stol(optarg); + count = std::stoul(optarg); break; case 't': type = std::stoi(optarg); @@ -155,19 +155,20 @@ int main(int argc, char *argv[]) { nanoseconds max = {}; for (size_t i = 0; i < iters; ++i) { const key val = ud(gen); - auto start = steady_clock::now(); + auto iter_start = steady_clock::now(); const auto it = m.find(val); if (it == m.end()) { m.insert({val, {}}); } else { m.erase(it); } - auto stop = steady_clock::now(); - max = std::max(max, stop - start); + auto iter_stop = steady_clock::now(); + max = std::max(max, iter_stop - iter_start); } std::cout << n << ": mean " - << duration_cast(duration).count() / iters + << duration_cast(duration).count() / + static_cast(iters) << " ns/iter, max " << max.count() << " ns/iter" << std::endl; }; diff --git a/src/HashMapExample.cpp b/src/HashMapExample.cpp index 2a0d8d3..0f5345d 100644 --- a/src/HashMapExample.cpp +++ b/src/HashMapExample.cpp @@ -13,8 +13,10 @@ int main(int argc, char *argv[]) { // Hash for using std::string as lookup key struct Hash { - size_t operator()(int v) { return v * 7; } - size_t operator()(const std::string &v) { return std::stoi(v) * 7; } + size_t operator()(int v) { return static_cast(v) * 7; } + size_t operator()(const std::string &v) { + return static_cast(std::stoi(v)) * 7; + } }; // Equal comparison for using std::string as lookup key diff --git a/src/HashMapTest.cpp b/src/HashMapTest.cpp index 12b3f1e..daa8427 100644 --- a/src/HashMapTest.cpp +++ b/src/HashMapTest.cpp @@ -12,11 +12,11 @@ using namespace rigtorp; static bool ok = true; #define EXPECT(expr) \ - ([](bool res) { \ - if (!res) { \ + ([](bool expect_res) { \ + if (!expect_res) { \ fprintf(stdout, "FAILED %s:%i: %s\n", __FILE__, __LINE__, #expr); \ } \ - ok = ok && res; \ + ok = ok && expect_res; \ }(static_cast(expr))) #define THROWS(expr) \ ([&]() { \ @@ -29,8 +29,10 @@ static bool ok = true; }()) struct Hash { - size_t operator()(int v) { return v * 7; } - size_t operator()(const std::string &v) { return std::stoi(v) * 7; } + size_t operator()(int v) { return static_cast(v) * 7; } + size_t operator()(const std::string &v) { + return static_cast(std::stoi(v)) * 7; + } }; struct Equal { @@ -230,11 +232,11 @@ int main(int argc, char *argv[]) { std::array visited = {}; for (auto it = hm.begin(); it != hm.end(); ++it) { - visited[it->first] = true; + visited[static_cast(it->first)] = true; } for (int i = 1; i < 100; ++i) { - EXPECT(visited[i]); + EXPECT(visited[static_cast(i)]); } // Test for iterator traits @@ -469,7 +471,7 @@ int main(int argc, char *argv[]) { // Bucket interface { // Small maps can hold their first element without growing. - for (size_t requested : {0, 1, 2}) { + for (size_t requested : {size_t{0}, size_t{1}, size_t{2}}) { HashMap hm(requested, -1); EXPECT(hm.empty()); EXPECT(hm.bucket_count() == 2); @@ -498,7 +500,8 @@ int main(int argc, char *argv[]) { { // Larger requests still round up to the next power of two. - for (size_t requested : {3, 4, 5, 8, 9}) { + for (size_t requested : + {size_t{3}, size_t{4}, size_t{5}, size_t{8}, size_t{9}}) { HashMap hm(requested, -1); const size_t expected = requested <= 4 ? 4 : requested <= 8 ? 8 : 16; EXPECT(hm.bucket_count() == expected); diff --git a/tests/cmake/check.cmake b/tests/cmake/check.cmake deleted file mode 100644 index d277562..0000000 --- a/tests/cmake/check.cmake +++ /dev/null @@ -1,44 +0,0 @@ -cmake_minimum_required(VERSION 3.20) - -if(NOT HASHMAP_SOURCE_DIR OR NOT HASHMAP_CHECK_DIR) - message(FATAL_ERROR "Set HASHMAP_SOURCE_DIR and HASHMAP_CHECK_DIR") -endif() - -function(run) - execute_process(COMMAND ${ARGV} COMMAND_ECHO STDOUT RESULT_VARIABLE result) - if(NOT result EQUAL 0) - message(FATAL_ERROR "Command failed (${result}): ${ARGV}") - endif() -endfunction() - -function(check_consumer name) - set(build "${HASHMAP_CHECK_DIR}/${name}") - run("${CMAKE_COMMAND}" -S "${HASHMAP_SOURCE_DIR}/tests/cmake/consumer" - -B "${build}" ${ARGN}) - run("${CMAKE_COMMAND}" --build "${build}" --config Debug --parallel 2) - run("${CMAKE_CTEST_COMMAND}" --test-dir "${build}" -C Debug --output-on-failure) -endfunction() - -set(library_build "${HASHMAP_CHECK_DIR}/library") -set(prefix "${HASHMAP_CHECK_DIR}/prefix") -run("${CMAKE_COMMAND}" -S "${HASHMAP_SOURCE_DIR}" -B "${library_build}" - -DHASHMAP_BUILD_TESTS=OFF -DHASHMAP_BUILD_EXAMPLES=OFF - -DHASHMAP_BUILD_BENCHMARKS=OFF -DHASHMAP_INSTALL=ON - -DCMAKE_INSTALL_INCLUDEDIR=include -DCMAKE_INSTALL_LIBDIR=lib) -run("${CMAKE_COMMAND}" --build "${library_build}" --config Debug) -run("${CMAKE_COMMAND}" --install "${library_build}" --config Debug --prefix "${prefix}") - -check_consumer(embedded "-DHASHMAP_SOURCE_DIR=${HASHMAP_SOURCE_DIR}") -check_consumer(build-tree "-DHashMap_DIR=${library_build}") -check_consumer(installed "-DCMAKE_PREFIX_PATH=${prefix}") - -set(custom_build "${HASHMAP_CHECK_DIR}/custom-library") -set(custom_prefix "${HASHMAP_CHECK_DIR}/custom-prefix") -set(relocated_prefix "${HASHMAP_CHECK_DIR}/relocated-prefix") -run("${CMAKE_COMMAND}" -S "${HASHMAP_SOURCE_DIR}" -B "${custom_build}" - -DHASHMAP_BUILD_TESTS=OFF -DHASHMAP_BUILD_EXAMPLES=OFF - -DHASHMAP_BUILD_BENCHMARKS=OFF -DHASHMAP_INSTALL=ON - -DCMAKE_INSTALL_INCLUDEDIR=custom/include -DCMAKE_INSTALL_LIBDIR=custom/lib) -run("${CMAKE_COMMAND}" --install "${custom_build}" --config Debug --prefix "${custom_prefix}") -file(RENAME "${custom_prefix}" "${relocated_prefix}") -check_consumer(relocated "-DHashMap_DIR=${relocated_prefix}/custom/lib/cmake/HashMap") diff --git a/tests/cmake/consumer/CMakeLists.txt b/tests/cmake/consumer/CMakeLists.txt deleted file mode 100644 index 8b3cfad..0000000 --- a/tests/cmake/consumer/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -cmake_minimum_required(VERSION 3.20) -project(HashMapConsumer LANGUAGES CXX) - -if(HASHMAP_SOURCE_DIR) - add_subdirectory("${HASHMAP_SOURCE_DIR}" hashmap) - foreach(target HashMapTest HashMapExample HashMapBenchmark) - if(TARGET ${target}) - message(FATAL_ERROR "Embedded HashMap unexpectedly created ${target}") - endif() - endforeach() - if(HASHMAP_INSTALL) - message(FATAL_ERROR "Embedded HashMap unexpectedly enabled installation") - endif() -else() - find_package(HashMap 1 CONFIG REQUIRED) -endif() - -get_target_property(compile_options HashMap::HashMap INTERFACE_COMPILE_OPTIONS) -if(compile_options) - message(FATAL_ERROR "HashMap leaked executable compiler options: ${compile_options}") -endif() - -add_executable(consumer main.cpp) -target_link_libraries(consumer PRIVATE HashMap::HashMap) -set_target_properties(consumer PROPERTIES - CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF) -enable_testing() -add_test(NAME consumer COMMAND consumer) diff --git a/tests/cmake/consumer/main.cpp b/tests/cmake/consumer/main.cpp deleted file mode 100644 index 99713ef..0000000 --- a/tests/cmake/consumer/main.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -int main() { - rigtorp::HashMap map(0, -1); - map.emplace(0, 42); - map.emplace(1, 43); - map.erase(1); - return map.size() == 1 && map.at(0) == 42 ? 0 : 1; -}