From 63a54cce5158e65e28502682d9238470a7c6cf7d Mon Sep 17 00:00:00 2001 From: Florent Hivert Date: Sat, 28 Oct 2023 22:20:40 +0100 Subject: [PATCH] Removed HPCombi-Config system --- CMakeLists.txt | 6 +----- config.h.in | 17 ----------------- examples/CMakeLists.txt | 4 ++++ include/epu.hpp | 4 ---- 4 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 config.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index cec744ea..5e9dff9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,8 +132,7 @@ IF (BUILD_TESTING) ENDIF(BUILD_TESTING) ##################### -# config.h file stuff -configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/HPCombi-config.h) +# Is this needed ? configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_BINARY_DIR}/.VERSION) set(AUTOGENERATED_WARNING "WARNING: THIS IS A CMAKE AUTO-GENERATED FILE.") @@ -149,9 +148,6 @@ endforeach(f) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/.VERSION DESTINATION ".") -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/HPCombi-config.h - DESTINATION include/${CMAKE_PROJECT_NAME}) - install ( DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/${CMAKE_PROJECT_NAME} diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 7a1f2ccc..00000000 --- a/config.h.in +++ /dev/null @@ -1,17 +0,0 @@ -//****************************************************************************// -// File : HPCombi-config.h -// Description : Configuration of @PROJECT_NAME@ -// -// @AUTOGENERATED_WARNING@ -//****************************************************************************// - -#ifndef HPCOMBI_CONFIG_HPP -#define HPCOMBI_CONFIG_HPP - -// Google sparse hash map -#cmakedefine HPCOMBI_HAVE_DENSEHASHMAP - -// Google sparse hash set -#cmakedefine HPCOMBI_HAVE_DENSEHASHSET - -#endif // HPCOMBI_CONFIG_HPP diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index fa9540a9..e8e073ee 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -17,10 +17,14 @@ include (CheckIncludeFileCXX) check_include_file_cxx("sparsehash/dense_hash_map" HPCOMBI_HAVE_DENSEHASHMAP) if (NOT HPCOMBI_HAVE_DENSEHASHMAP) message(STATUS "Google 'dense_hash_map' not found, using std::unordered_map") +else() + add_compile_definitions(HPCOMBI_HAVE_DENSEHASHMAP) endif() check_include_file_cxx("sparsehash/dense_hash_set" HPCOMBI_HAVE_DENSEHASHSET) if (NOT HPCOMBI_HAVE_DENSEHASHSET) message(STATUS "Google 'dense_hash_set' not found, using std::unordered_set") +else() + add_compile_definitions(HPCOMBI_HAVE_DENSEHASHSET) endif() include_directories(${CMAKE_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}) diff --git a/include/epu.hpp b/include/epu.hpp index 00fa8e9b..5ea6ab72 100644 --- a/include/epu.hpp +++ b/include/epu.hpp @@ -26,10 +26,6 @@ #include #include // integer_sequences -#ifdef HPCOMBI_HAVE_CONFIG -#include "HPCombi-config.h" -#endif - #include "vect_generic.hpp" #include "simde/x86/sse4.1.h"