Make presence of crc32c_config.h optional

This facilitates integration of the library into different build systems. Add `CRC32C_HAVE_CONFIG_H` define set by CMake.
bitcoin-core · Nov 7, 2019 · a3f2c1c · a3f2c1c
1 parent 675775b
commit a3f2c1c
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -290,6 +290,11 @@ target_include_directories(crc32c
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+target_compile_definitions(crc32c
+PRIVATE
+  CRC32C_HAVE_CONFIG_H=1
+)
+
 set_target_properties(crc32c
   PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
 

diff --git a/src/crc32c_arm64.cc b/src/crc32c_arm64.cc
@@ -14,7 +14,9 @@
 #include <cstdint>
 
 #include "./crc32c_internal.h"
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_ARM64_CRC32C
 

diff --git a/src/crc32c_arm64.h b/src/crc32c_arm64.h
@@ -10,7 +10,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_ARM64_CRC32C
 

diff --git a/src/crc32c_arm64_linux_check.h b/src/crc32c_arm64_linux_check.h
@@ -12,7 +12,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_ARM64_CRC32C
 

diff --git a/src/crc32c_benchmark.cc b/src/crc32c_benchmark.cc
@@ -5,7 +5,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #include "benchmark/benchmark.h"
 

diff --git a/src/crc32c_prefetch.h b/src/crc32c_prefetch.h
@@ -8,7 +8,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_MM_PREFETCH
 

diff --git a/src/crc32c_read_le.h b/src/crc32c_read_le.h
@@ -8,7 +8,9 @@
 #include <cstdint>
 #include <cstring>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 namespace crc32c {
 

diff --git a/src/crc32c_sse42.cc b/src/crc32c_sse42.cc
@@ -17,7 +17,9 @@
 #include "./crc32c_prefetch.h"
 #include "./crc32c_read_le.h"
 #include "./crc32c_round_up.h"
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_SSE42 && (defined(_M_X64) || defined(__x86_64__))
 

diff --git a/src/crc32c_sse42.h b/src/crc32c_sse42.h
@@ -10,7 +10,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 // The hardware-accelerated implementation is only enabled for 64-bit builds,
 // because a straightforward 32-bit implementation actually runs slower than the

diff --git a/src/crc32c_sse42_check.h b/src/crc32c_sse42_check.h
@@ -10,7 +10,9 @@
 #include <cstddef>
 #include <cstdint>
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #if HAVE_SSE42 && (defined(_M_X64) || defined(__x86_64__))
 

diff --git a/src/crc32c_test_main.cc b/src/crc32c_test_main.cc
@@ -2,7 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#ifdef CRC32C_HAVE_CONFIG_H
 #include "crc32c/crc32c_config.h"
+#endif
 
 #include "gtest/gtest.h"