Merge pull request #364 from arene-os-services-cockpit-tmc-wa/jw/comp…

…iler-thread Move thread detection into compiler
toyota-connected · Feb 3, 2025 · e1bd3bd · e1bd3bd
2 parents d5161a6 + a42091a
commit e1bd3bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
@@ -132,15 +132,22 @@ if (ENABLE_LTO)
 endif ()
 
 #
-# Compiler specific settings
+# Toolchain target
 #
-message(STATUS "CMAKE_CXX_COMPILER_ID .. ${CMAKE_CXX_COMPILER_ID}")
-message(STATUS "CMAKE_CXX_COMPILER_VERSION: ${CMAKE_CXX_COMPILER_VERSION}")
+message(STATUS "Compiler ............... ${CMAKE_CXX_COMPILER_ID}")
+message(STATUS "Compiler Version ....... ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     include(compiler_clang)
 endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
     include(compiler_gnu)
-endif ()
+endif ()
+
+#
+# Threads
+#
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+target_link_libraries(toolchain INTERFACE Threads::Threads)
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
@@ -116,10 +116,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
         platform_homescreen
 )
 
-if (NOT LLVM_ENABLE_THREADS)
-    target_link_libraries(${PROJECT_NAME} PUBLIC Threads::Threads)
-endif ()
-
 target_link_directories(${PROJECT_NAME} PRIVATE
         ${CMAKE_BINARY_DIR}
 )

diff --git a/third_party/waypp b/third_party/waypp