[cmake] Add built-in variable to run the llvm-link tool.

Author: kaniandr

CMakeLists.txt

@@ -24,6 +24,8 @@ set(PTS_EXECUTABLE "" CACHE FILEPATH  "Path to PTS which runs tests.")
 if (NOT EXISTS "${PTS_EXECUTABLE}")
   message(SEND_ERROR "Could NOT find PTS which is required to run tests."
                      " Set PTS_EXECUTABLE variable.")
+else()
+  message(STATUS "Perl executable: ${PERL_EXECUTABLE}")
 endif()
 get_filename_component(TS_PTS_PATH "${PTS_EXECUTABLE}" ABSOLUTE)
 
@@ -39,6 +41,13 @@ if (TSAR_FOUND)
     if (TS_CLANG_TOOL)
       message(STATUS "Use Clang from TSAR package.")
     endif()
+    set(TS_LLVM_LINK_TOOL)
+    if ("llvm-link" IN_LIST TSAR_LLVM_TOOLS)
+      set(TS_LLVM_LINK_TOOL llvm-link)
+    endif()
+    if (TS_LLVM_LINK_TOOL)
+      message(STATUS "Use llvm-link from TSAR package.")
+    endif()
   endif()
   if (TSAR_EXECUTABLE)
     set(TC_SUFFIX "")
@@ -72,10 +81,14 @@ if (TSAR_FOUND)
     if (TS_CLANG_TOOL)
       set(TS_CLANG_PATH "${TS_BINARY_DEFAULT_DIR}/${TS_CLANG_TOOL}${CMAKE_EXECUTABLE_SUFFIX}")
     endif()
+    if (TS_LLVM_LINK_TOOL)
+      set(TS_LLVM_LINK_PATH "${TS_BINARY_DEFAULT_DIR}/${TS_LLVM_LINK_TOOL}${CMAKE_EXECUTABLE_SUFFIX}")
+    endif()
   else()
     set(TS_TSAR_PATH)
     set(TS_INCLUDE_PATH)
     set(TS_CLANG_PATH)
+    set(TS_LLVM_LINK_PATH)
     foreach(CONFIG_NAME ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER ${CONFIG_NAME} C)
       list(FIND TSAR_CONFIGURATIONS ${C} TSAR_ENABLE_${C})
@@ -92,6 +105,9 @@ if (TSAR_FOUND)
       if (TS_CLANG_TOOL)
         set(TS_CLANG_PATH "${TS_CLANG_PATH}$<$<CONFIG:${C}>:${TSAR_BINARY_DIR_${C}}/${TS_CLANG_TOOL}${CMAKE_EXECUTABLE_SUFFIX}>")
       endif()
+      if (TS_LLVM_LINK_TOOL)
+        set(TS_LLVM_LINK_PATH "${TS_LLVM_LINK_PATH}$<$<CONFIG:${C}>:${TSAR_BINARY_DIR_${C}}/${TS_LLVM_LINK_TOOL}${CMAKE_EXECUTABLE_SUFFIX}>")
+      endif()
       set(TS_LIBRARY_PATH "'$<SHELL_PATH:${TSAR_BINARY_DIR_${C}}/../lib>'")
       file(GLOB TS_OMP_LIBRARIES LIST_DIRECTORIES false
                 RELATIVE ${TS_LIBRARY_PATH} ${TS_LIBRARY_PATH}/*omp.*)
@@ -104,34 +120,56 @@ if (TSAR_FOUND)
   if (TS_CLANG_TOOL)
     set(TS_CLANG_PATH "$<SHELL_PATH:${TS_CLANG_PATH}>")
   endif()
+  if (TS_LLVM_LINK_TOOL)
+    set(TS_LLVM_LINK_PATH "$<SHELL_PATH:${TS_LLVM_LINK_PATH}>")
+  endif()
 endif()
 
-if (NOT TS_CLANG_PATH)
+if (NOT TS_CLANG_PATH OR NOT TS_LLVM_LINK_PATH)
   find_package(LLVM ${TSAR_LLVM_VERSION})
   if (LLVM_FOUND)
     set(TS_LIBRARY_PATH "${TS_LIBRARY_PATH} '$<SHELL_PATH:${LLVM_BINARY_DIR}/lib>'")
     file(GLOB TS_OMP_LIBRARIES LIST_DIRECTORIES false
               RELATIVE ${LLVM_BINARY_DIR}/lib ${LLVM_BINARY_DIR}/lib/*omp.*)
     message(STATUS "LLVM version: ${LLVM_VERSION}")
-    message(STATUS "Lookup for Clang in ${LLVM_BINARY_DIR}/lib/cmake/clang")
-    find_package(Clang HINTS "${LLVM_BINARY_DIR}/lib/cmake/clang" NO_DEFAULT_PATH)
-    if (TARGET clang)
-      get_property(CLANG_CONFIGURATIONS TARGET clang PROPERTY IMPORTED_CONFIGURATIONS)
-      if (CLANG_CONFIGURATIONS)
-        list(GET CLANG_CONFIGURATIONS 0 CLANG_CONFIG)
-	      get_property(TS_CLANG_PATH TARGET clang PROPERTY IMPORTED_LOCATION_${CLANG_CONFIG})
-	      message(STATUS "Find Clang configuration: ${CLANG_CONFIG}")
-      else()
-	      get_property(TS_CLANG_PATH TARGET clang PROPERTY IMPORTED_LOCATION)
+    if (NOT TS_LLVM_LINK_PATH)
+      if (TARGET llvm-link)
+        get_property(LLVM_LINK_CONFIGURATIONS TARGET llvm-link PROPERTY IMPORTED_CONFIGURATIONS)
+        if (LLVM_LINK_CONFIGURATIONS)
+          list(GET LLVM_LINK_CONFIGURATIONS 0 LLVM_LINK_CONFIG)
+          get_property(TS_LLVM_LINK_PATH TARGET llvm-link PROPERTY IMPORTED_LOCATION_${LLVM_LINK_CONFIG})
+          message(STATUS "Find llvm-link configuration: ${LLVM_LINK_CONFIG}")
+        else()
+          get_property(TS_LLVM_LINK_PATH TARGET llvm-link PROPERTY IMPORTED_LOCATION)
+        endif()
       endif()
-      if (TSAR_LLVM_VERSION)
-        set(TS_INCLUDE_PATH "${TS_INCLUDE_PATH} '$<SHELL_PATH:${LLVM_BINARY_DIR}/lib/clang/${TSAR_LLVM_VERSION}/include>'")
+      if (NOT TS_LLVM_LINK_PATH)
+        message(WARNING "Could NOT find suitable llvm-link executable, be sure it is installed.")
+      else()
+        message(STATUS "llvm-link executable: ${TS_LLVM_LINK_PATH}")
       endif()
     endif()
     if (NOT TS_CLANG_PATH)
-      message(WARNING "Could NOT find suitable Clang executable, be sure it is installed.")
-    else()
-      message(STATUS "Clang executable: ${TS_CLANG_PATH}")
+      message(STATUS "Lookup for Clang in ${LLVM_BINARY_DIR}/lib/cmake/clang")
+      find_package(Clang HINTS "${LLVM_BINARY_DIR}/lib/cmake/clang" NO_DEFAULT_PATH)
+      if (TARGET clang)
+        get_property(CLANG_CONFIGURATIONS TARGET clang PROPERTY IMPORTED_CONFIGURATIONS)
+        if (CLANG_CONFIGURATIONS)
+          list(GET CLANG_CONFIGURATIONS 0 CLANG_CONFIG)
+          get_property(TS_CLANG_PATH TARGET clang PROPERTY IMPORTED_LOCATION_${CLANG_CONFIG})
+          message(STATUS "Find Clang configuration: ${CLANG_CONFIG}")
+        else()
+          get_property(TS_CLANG_PATH TARGET clang PROPERTY IMPORTED_LOCATION)
+        endif()
+        if (TSAR_LLVM_VERSION)
+          set(TS_INCLUDE_PATH "${TS_INCLUDE_PATH} '$<SHELL_PATH:${LLVM_BINARY_DIR}/lib/clang/${TSAR_LLVM_VERSION}/include>'")
+        endif()
+      endif()
+      if (NOT TS_CLANG_PATH)
+        message(WARNING "Could NOT find suitable Clang executable, be sure it is installed.")
+      else()
+        message(STATUS "Clang executable: ${TS_CLANG_PATH}")
+      endif()
     endif()
   endif()
 endif()
@@ -179,6 +217,7 @@ endmacro()
 
 quote_path(TS_TSAR_PATH)
 quote_path(TS_CLANG_PATH)
+quote_path(TS_LLVM_LINK_PATH)
 quote_path(TS_DVM_PATH)
 
 configure_file(sys/config.in sys/config.gen @ONLY)

sys/Plugins/TsarPlugin.pm

@@ -23,6 +23,7 @@ my %required_vars = (
   '' => [qw(
     tsar
     clang
+    llvm_link
     include
     lib
     dvm

sys/config.in

@@ -2,5 +2,6 @@ tsar=@TS_TSAR_PATH@
 include=@TS_INCLUDE_PATH@
 lib=@TS_LIBRARY_PATH@
 clang=@TS_CLANG_PATH@
+llvm_link=@TS_LLVM_LINK_PATH@
 dvm=@TS_DVM_PATH@
 openmp=@TS_OMP_LIBRARIES@