deploy(conan): fix ci? libclang-cpp.so forced libLLVM.so

Author: jusito-iem

cmake/add_llvm.cmake

@@ -59,7 +59,11 @@ macro(add_clang)
     find_package(Clang REQUIRED)
     set(CLANG_LIBRARY clangCodeGen clangTooling)
   elseif(NOT PHASAR_IN_TREE)
+    if (USE_LLVM_FAT_LIB)
     find_library(CLANG_LIBRARY NAMES clang-cpp libclang-cpp HINTS ${LLVM_LIBRARY_DIRS})
+    else()
+      find_library(CLANG_LIBRARY NAMES clangCodeGen clangTooling HINTS ${LLVM_LIBRARY_DIRS})
+    endif()
     if(${CLANG_LIBRARY} STREQUAL "CLANG_LIBRARY-NOTFOUND")
       set(NEED_LIBCLANG_COMPONENT_LIBS ON)
     endif()

cmake/phasar_macros.cmake

@@ -62,52 +62,66 @@ function(generate_ll_file)
   if (NOT clang)
     # Conan deps are available in in PATH
     foreach(hint "${LLVM_TOOLS_BINARY_DIR}" "${Clang_INCLUDE_DIR}/../bin" "${LLVM_INCLUDE_DIR}/../bin" "/usr/local/llvm-14/bin")
-      cmake_path(NORMAL_PATH hint OUTPUT_VARIABLE hint)
+      if ("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.20")
+        cmake_path(NORMAL_PATH hint OUTPUT_VARIABLE hint)
+      endif()
       list(APPEND binary_hint_paths "${hint}")
     endforeach()
     message(STATUS "HINTS to find clang/clang++/opt: ${binary_hint_paths}")
 
     if ("${CMAKE_VERSION}" VERSION_LESS "3.25") # VALIDATOR requires it
-
+      message(WARNING "I would prefer CMake >= 3.25 but I will try my best to resolve deps.")
       find_program(clang REQUIRED
         NAMES clang-14 clang
         HINTS ${binary_hint_paths})
       find_program(clangcpp REQUIRED
-        NAMES clang++
+        NAMES clang++-14 clang++ 
         HINTS ${binary_hint_paths})
       find_program(opt REQUIRED
-        NAMES opt
+        NAMES opt-14 opt
         HINTS ${binary_hint_paths})
 
       set(IS_VALID_VERSION "")
       validate_binary_version("IS_VALID_VERSION" "${clang}")
       if (NOT "${IS_VALID_VERSION}")
-        message(FATAL_ERROR "Couldn't find clang in version 14")
+        set(clang "")
       endif()
       validate_binary_version("IS_VALID_VERSION" "${clangcpp}")
       if (NOT "${IS_VALID_VERSION}")
-        message(FATAL_ERROR "Couldn't find clang++ in version 14")
+        set(clangcpp "")
       endif()
       validate_binary_version("IS_VALID_VERSION" "${opt}")
       if (NOT "${IS_VALID_VERSION}")
-        message(FATAL_ERROR "Couldn't find opt in version 14")
+        set(opt "")
       endif()
     else()
       find_program(clang REQUIRED
         NAMES clang-14 clang
         HINTS ${binary_hint_paths}
         VALIDATOR validate_binary_version)
-      message(STATUS "found clang binary in \"${clang}\"")
       find_program(clangcpp REQUIRED
-        NAMES clang++
+        NAMES clang++-14 clang++
         HINTS ${binary_hint_paths}
         VALIDATOR validate_binary_version)
-      message(STATUS "found clang binary in \"${clangpp}\"")
       find_program(opt REQUIRED
-        NAMES opt
+        NAMES opt-14 opt
         HINTS ${binary_hint_paths}
         VALIDATOR validate_binary_version)
-      message(STATUS "found clang binary in \"${opt}\"")
+    endif()
+    if ("${clang}" STREQUAL "")
+      message(FATAL_ERROR "Couldn't find clang in version 14")
+    else()
+      message(STATUS "found clang binary in \"${clang}\"")
+    endif()
+    if ("${clangcpp}" STREQUAL "")
+      message(FATAL_ERROR "Couldn't find clang++ in version 14")
+    else()
+      message(STATUS "found clang++ binary in \"${clangcpp}\"")
+    endif()
+    if ("${opt}" STREQUAL "")
+      message(FATAL_ERROR "Couldn't find opt in version 14")
+    else()
+      message(STATUS "found opt binary in \"${opt}\"")
     endif()
   endif()