From 29f262d1b4d918ce1b96b8ab0536ae9fc343e6b3 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Sat, 2 Jan 2021 17:33:37 +0000 Subject: Hopefully fix failure to find libdispatch on Mac OS. Also hopefully fix test failure on Windows. --- CMakeLists.txt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index d6112775..0a82bd45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -286,23 +286,25 @@ int main() { endif() # Do we have Grand Central Dispatch on this platform? if(NOT LLFIO_DISABLE_LIBDISPATCH) - function(check_have_libdispatch) - set(CMAKE_REQUIRED_LIBRARIES dispatch) + function(check_have_libdispatch postfix) + set(CMAKE_REQUIRED_LIBRARIES ${ARGN}) check_cxx_source_compiles(" #include int main() { dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0); return 0; } -" LLFIO_HAS_LIBDISPATCH) +" LLFIO_HAS_LIBDISPATCH_${postfix}) endfunction() - check_have_libdispatch() - if(LLFIO_HAS_LIBDISPATCH) - all_compile_definitions(PUBLIC LLFIO_FORCE_USE_LIBDISPATCH=1) - all_link_libraries(PUBLIC dispatch) + check_have_libdispatch(BUILTIN) + if(NOT LLFIO_HAS_LIBDISPATCH_BUILTIN) + check_have_libdispatch(WITH_LIBDISPATCH) + if(LLFIO_HAS_LIBDISPATCH_WITH_LIBDISPATCH) + all_link_libraries(PUBLIC dispatch) + endif() endif() endif() -if(NOT LLFIO_HAS_LIBDISPATCH AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)) +if(NOT LLFIO_HAS_LIBDISPATCH_BUILTIN AND NOT LLFIO_HAS_LIBDISPATCH_WITH_LIBDISPATCH AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)) indented_message(FATAL_ERROR "FATAL: Grand Central Dispatch as libdispatch was not found on this FreeBSD or Mac OS system. libdispatch is required for LLFIO to build on those systems.") endif() -- cgit v1.2.3