Don't use dispatch if we can't build it

desktop-app · Dec 29, 2021 · 753514c · 753514c
1 parent 3fde21b
commit 753514c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -67,15 +67,21 @@ PUBLIC
     ${src_loc}
 )
 
-if (LINUX)
+if (TARGET desktop-app::external_dispatch)
     target_link_libraries(lib_crl
     PUBLIC
         desktop-app::external_dispatch
+    )
+endif()
+
+if (LINUX)
+    target_link_libraries(lib_crl
+    PUBLIC
         pthread
     )
 endif()
 
-if (build_macstore OR LINUX)
+if (build_macstore OR TARGET desktop-app::external_dispatch)
     target_compile_definitions(lib_crl
     PUBLIC
         CRL_USE_COMMON_QUEUE

diff --git a/crl/common/crl_common_config.h b/crl/common/crl_common_config.h
@@ -33,7 +33,7 @@
 #define CRL_USE_WINAPI_LIST
 #endif // !CRL_FORCE_STD_LIST
 
-#elif !defined CRL_FORCE_QT // _MSC_VER && !CRL_FORCE_QT
+#elif __has_include(<dispatch/dispatch.h>) && !defined CRL_FORCE_QT // _MSC_VER && !CRL_FORCE_QT
 
 // gcc compatibility
 #ifndef __has_feature
@@ -47,7 +47,7 @@
 #define CRL_USE_DISPATCH
 #define CRL_USE_COMMON_LIST
 
-#elif __has_include(<QtCore/QThreadPool>) // !CRL_FORCE_QT
+#elif __has_include(<QtCore/QThreadPool>) // dispatch && !CRL_FORCE_QT
 
 #define CRL_USE_QT
 #define CRL_USE_COMMON_LIST