Removed HPCombi-Config system

libsemigroups · Oct 28, 2023 · 63a54cc · 63a54cc
1 parent a9db482
commit 63a54cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 26 deletions.
diff --git 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
diff --git 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
@@ -26,10 +26,6 @@
 #include <type_traits>
 #include <utility>   // integer_sequences
 
-#ifdef HPCOMBI_HAVE_CONFIG
-#include "HPCombi-config.h"
-#endif
-
 #include "vect_generic.hpp"
 
 #include "simde/x86/sse4.1.h"