diff --git a/CMakeLists.txt b/CMakeLists.txt index 86edfb628fb..185ed4ed711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -387,12 +387,13 @@ target_link_options(sanitize_interface INTERFACE ${SANITIZER_LDFLAGS}) if(BUILD_FUZZ_BINARY) include(CheckSourceCompilesAndLinks) - check_cxx_source_compiles_with_flags("${SANITIZER_LDFLAGS}" " + check_cxx_source_compiles_with_flags(" #include #include extern \"C\" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { return 0; } // No main() function. " FUZZ_BINARY_LINKS_WITHOUT_MAIN_FUNCTION + LDFLAGS ${SANITIZER_LDFLAGS} ) endif() diff --git a/cmake/crc32c.cmake b/cmake/crc32c.cmake index 16fde7f95da..ec54e864c04 100644 --- a/cmake/crc32c.cmake +++ b/cmake/crc32c.cmake @@ -7,6 +7,7 @@ # buildsystem. include(CheckCXXSourceCompiles) +include(CheckSourceCompilesAndLinks) # Check for __builtin_prefetch support in the compiler. check_cxx_source_compiles(" @@ -42,7 +43,7 @@ if(MSVC) else() set(SSE42_CXXFLAGS -msse4.2) endif() -check_cxx_source_compiles_with_flags("${SSE42_CXXFLAGS}" " +check_cxx_source_compiles_with_flags(" #include #if defined(_MSC_VER) #include @@ -58,11 +59,12 @@ check_cxx_source_compiles_with_flags("${SSE42_CXXFLAGS}" " return l; } " HAVE_SSE42 + CXXFLAGS ${SSE42_CXXFLAGS} ) # Check for ARMv8 w/ CRC and CRYPTO extensions support in the compiler. set(ARM64_CRC_CXXFLAGS -march=armv8-a+crc+crypto) -check_cxx_source_compiles_with_flags("${ARM64_CRC_CXXFLAGS}" " +check_cxx_source_compiles_with_flags(" #include #include @@ -76,6 +78,7 @@ check_cxx_source_compiles_with_flags("${ARM64_CRC_CXXFLAGS}" " return 0; } " HAVE_ARM64_CRC32C + CXXFLAGS ${ARM64_CRC_CXXFLAGS} ) add_library(crc32c_common INTERFACE) diff --git a/cmake/introspection.cmake b/cmake/introspection.cmake index 29c93869a73..ec756207e21 100644 --- a/cmake/introspection.cmake +++ b/cmake/introspection.cmake @@ -164,7 +164,7 @@ if(NOT MSVC) # Check for SSE4.1 intrinsics. set(SSE41_CXXFLAGS -msse4.1) - check_cxx_source_compiles_with_flags("${SSE41_CXXFLAGS}" " + check_cxx_source_compiles_with_flags(" #include int main() @@ -175,12 +175,13 @@ if(NOT MSVC) return _mm_extract_epi32(r, 3); } " HAVE_SSE41 + CXXFLAGS ${SSE41_CXXFLAGS} ) set(ENABLE_SSE41 ${HAVE_SSE41}) # Check for AVX2 intrinsics. set(AVX2_CXXFLAGS -mavx -mavx2) - check_cxx_source_compiles_with_flags("${AVX2_CXXFLAGS}" " + check_cxx_source_compiles_with_flags(" #include int main() @@ -189,12 +190,13 @@ if(NOT MSVC) return _mm256_extract_epi32(l, 7); } " HAVE_AVX2 + CXXFLAGS ${AVX2_CXXFLAGS} ) set(ENABLE_AVX2 ${HAVE_AVX2}) # Check for x86 SHA-NI intrinsics. set(X86_SHANI_CXXFLAGS -msse4 -msha) - check_cxx_source_compiles_with_flags("${X86_SHANI_CXXFLAGS}" " + check_cxx_source_compiles_with_flags(" #include int main() @@ -205,12 +207,13 @@ if(NOT MSVC) return _mm_extract_epi32(_mm_sha256rnds2_epu32(i, j, k), 0); } " HAVE_X86_SHANI + CXXFLAGS ${X86_SHANI_CXXFLAGS} ) set(ENABLE_X86_SHANI ${HAVE_X86_SHANI}) # Check for ARMv8 SHA-NI intrinsics. set(ARM_SHANI_CXXFLAGS -march=armv8-a+crypto) - check_cxx_source_compiles_with_flags("${ARM_SHANI_CXXFLAGS}" " + check_cxx_source_compiles_with_flags(" #include int main() @@ -222,6 +225,7 @@ if(NOT MSVC) vsha256su1q_u32(a, b, c); } " HAVE_ARM_SHANI + CXXFLAGS ${ARM_SHANI_CXXFLAGS} ) set(ENABLE_ARM_SHANI ${HAVE_ARM_SHANI}) endif() diff --git a/cmake/minisketch.cmake b/cmake/minisketch.cmake index 7407739ed94..6feffa7d3a7 100644 --- a/cmake/minisketch.cmake +++ b/cmake/minisketch.cmake @@ -2,13 +2,15 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or https://opensource.org/license/mit/. +include(CheckSourceCompilesAndLinks) + # Check for clmul instructions support. if(MSVC) - set(CLMUL_CXXFLAGS) + set(CLMUL_CXXFLAGS "") else() set(CLMUL_CXXFLAGS -mpclmul) endif() -check_cxx_source_compiles_with_flags("${CLMUL_CXXFLAGS}" " +check_cxx_source_compiles_with_flags(" #include #include @@ -22,6 +24,7 @@ check_cxx_source_compiles_with_flags("${CLMUL_CXXFLAGS}" " return e == 0; } " HAVE_CLMUL + CXXFLAGS ${CLMUL_CXXFLAGS} ) add_library(minisketch_common INTERFACE) diff --git a/cmake/module/CheckSourceCompilesAndLinks.cmake b/cmake/module/CheckSourceCompilesAndLinks.cmake index 7a2751c2c7d..7967f38eded 100644 --- a/cmake/module/CheckSourceCompilesAndLinks.cmake +++ b/cmake/module/CheckSourceCompilesAndLinks.cmake @@ -6,13 +6,34 @@ include_guard(GLOBAL) include(CheckCXXSourceCompiles) include(CMakePushCheckState) -macro(check_cxx_source_compiles_with_flags flags source) - cmake_push_check_state(RESET) - set(CMAKE_REQUIRED_FLAGS ${flags}) - list(JOIN CMAKE_REQUIRED_FLAGS " " CMAKE_REQUIRED_FLAGS) - check_cxx_source_compiles("${source}" ${ARGN}) - cmake_pop_check_state() -endmacro() +#[=[ +Check once if C++ source code can be compiled. + +Options: + + CXXFLAGS - A list of additional flags to pass to the compiler. + + LDFLAGS - A list of additional flags to pass to the linker. + + LINK_LIBRARIES - A list of libraries to add to the link command. + +For historical reasons, among the CMake `CMAKE_REQUIRED_*` variables that influence +`check_cxx_source_compiles()`, only `CMAKE_REQUIRED_FLAGS` is a string rather than +a list. Additionally, `target_compile_options()` also expects a list of options. + +The `check_cxx_source_compiles_with_flags()` function handles this case and accepts +`CXXFLAGS` as a list, simplifying the code at the caller site. + +#]=] +function(check_cxx_source_compiles_with_flags source result_var) + cmake_parse_arguments(PARSE_ARGV 2 _ "" "" "CXXFLAGS;LDFLAGS;LINK_LIBRARIES") + list(JOIN __CXXFLAGS " " CMAKE_REQUIRED_FLAGS) + set(CMAKE_REQUIRED_LINK_OPTIONS ${__LDFLAGS}) + set(CMAKE_REQUIRED_LIBRARIES ${__LINK_LIBRARIES}) + include(CheckCXXSourceCompiles) + check_cxx_source_compiles("${source}" ${result_var}) + set(${result_var} ${${result_var}} PARENT_SCOPE) +endfunction() macro(check_cxx_source_links_with_libs libs source) cmake_push_check_state(RESET)