From fec5e6bb9cee1ed5a030bec9920c8c8f4c909416 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Wed, 20 Mar 2024 18:47:35 +0100 Subject: [PATCH] UNIX variable is true on Apple. --- cmake/server.cmake | 2 +- cmake/vendor.cmake | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/server.cmake b/cmake/server.cmake index 17b5de8f..58993101 100644 --- a/cmake/server.cmake +++ b/cmake/server.cmake @@ -33,7 +33,7 @@ if(NO_STATISTICS) target_compile_definitions(TracyServer PUBLIC TRACY_NO_STATISTICS) endif() -if(UNIX) +if(UNIX AND NOT APPLE) target_link_libraries(TracyServer PRIVATE TracyTbb) endif() diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 86e4be08..b5cd4366 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -190,9 +190,7 @@ if (NOT NO_FILESELECTOR) find_library(APPKIT_LIBRARY AppKit) find_library(UNIFORMTYPEIDENTIFIERS_LIBRARY UniformTypeIdentifiers) target_link_libraries(TracyNfd PUBLIC ${APPKIT_LIBRARY} ${UNIFORMTYPEIDENTIFIERS_LIBRARY}) - endif() - - if (UNIX) + elseif (UNIX) if (TRACY_GTK_FILESELECTOR) pkg_check_modules(GTK3 gtk+-3.0) if (NOT GTK3_FOUND) @@ -217,7 +215,7 @@ endif() # TBB -if (UNIX) +if (UNIX AND NOT APPLE) # Tracy does not use TBB directly, but the implementation of parallel algorithms # in some versions of libstdc++ depends on TBB. When it does, you must # explicitly link against -ltbb.