From 031d214f2ce1973933abdf2a998d986ff8094d8e Mon Sep 17 00:00:00 2001 From: greg Date: Wed, 26 May 2021 07:40:47 -0400 Subject: [PATCH] Fix cmake issue when using phmap as a submodule - issue #100 --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b67727..f7f82e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +cmake_minimum_required(VERSION 3.13.0) list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -10,8 +10,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) project(phmap VERSION ${DETECTED_PHMAP_VERSION} LANGUAGES CXX) -set(PHMAP_HEADERS phmap.h phmap_base.h phmap_bits.h phmap_utils.h phmap_config.h) set(PHMAP_DIR parallel_hashmap) +set(PHMAP_HEADERS ${PHMAP_DIR}/phmap.h + ${PHMAP_DIR}/phmap_base.h + ${PHMAP_DIR}/phmap_bits.h + ${PHMAP_DIR}/phmap_utils.h + ${PHMAP_DIR}/phmap_config.h) set(CMAKE_SUPPRESS_REGENERATION true) ## suppress ZERO_CHECK project include(GNUInstallDirs)