Merge pull request #358 from arene-os-services-cockpit-tmc-wa/jw/llvm…

…-config LLVM_CONFIG cmake variable
toyota-connected · Jan 23, 2025 · b0181d0 · b0181d0
2 parents f6dbbaf + fe30d7d
commit b0181d0
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/cmake/context.cmake b/cmake/context.cmake
@@ -34,8 +34,11 @@ endif ()
 # libc++
 #
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if (NOT LLVM_CONFIG)
+        set(LLVM_CONFIG llvm-config)
+    endif ()
     execute_process(
-            COMMAND llvm-config --version
+            COMMAND ${LLVM_CONFIG} --version
             OUTPUT_VARIABLE LLVM_VERSION
             OUTPUT_STRIP_TRAILING_WHITESPACE
     )
@@ -45,14 +48,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 
     if (NOT LLVM_ROOT)
         execute_process(
-                COMMAND llvm-config --prefix
+                COMMAND ${LLVM_CONFIG} --prefix
                 OUTPUT_VARIABLE LLVM_ROOT
                 OUTPUT_STRIP_TRAILING_WHITESPACE
         )
     endif ()
 
     if (NOT LLVM_ROOT)
-        message(WARNING "LLVM_ROOT not detected, using default")
+        message(WARNING "LLVM_ROOT not detected, using system default")
         set(LLVM_ROOT "/usr")
     endif ()
 
@@ -63,7 +66,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     set(CONTEXT_COMPILE_OPTIONS $<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++> $<$<COMPILE_LANGUAGE:CXX>:-isystem${LLVM_ROOT}/include/c++/v1/>)
 
     execute_process(
-            COMMAND llvm-config --cmakedir
+            COMMAND ${LLVM_CONFIG} --cmakedir
             OUTPUT_VARIABLE LLVM_CMAKE_DIR
             OUTPUT_STRIP_TRAILING_WHITESPACE
     )