Fix an issue of creating symlinks when llvm is embedded

[v.g.vassilev]

Summary

We configure with llvm with a script not from the command line. When trying to create a symlink we try to get a value from target property RUNTIME_OUTPUT_DIRECTORY_RELEASE which is only conditionally set (see set_output_directory).

Adjust the condition to match the conditional addition in `set_output_directory.

[v.g.vassilev]

Remove extra blank line.

[beanz]

How are you configuring? Unless I'm misunderstanding something when CMAKE_CONFIGURATION_TYPES is set CMAKE_CFG_INTDIR will never be ".".

The documentation of CMAKE_CFG_INTDIR lists its expansions (https://cmake.org/cmake/help/v3.0/variable/CMAKE_CFG_INTDIR.html), and the only case where it should be "." is if you're using a non-IDE generator. In which case CMAKE_CONFIGURATION_TYPES would be unset.

Are you overriding CMAKE_CFG_INTDIR? Because that would be bad.

[v.g.vassilev]

Thanks for looking into this.

We have a copy of llvm in the framework. We configure it from here: https://github.com/vgvassilev/root/blob/update-llvm-to-r302975/interpreter/CMakeLists.txt

Does that help?

[beanz]

Unfortunately that doesn't really explain the need for these patches. From searching GitHub it doesn't seem like your project is overriding CMAKE_CFG_INTDIR. What is your CMake command line?

This seems to me like a problem with your integration of LLVM into your project's build system, not a problem with LLVM's build system itself.

[v.g.vassilev]

cmake/modules/AddLLVM.cmake

220

@beanz, for some reason we when configuring we do not enter here. So we do not get a property RUNTIME_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}, when calling add_llvm_tool_symlink we have CMAKE_CONFIGURATION_TYPES so we enter in the branch where we should have set the property...

[v.g.vassilev]

That was a bug on our end. @beanz, thanks for pinpointing it and sorry for the noise!

cmake/modules/AddLLVM.cmake

if(NOT LLVM_NO_DEAD_STRIP)
                      LINK_FLAGS " -Wl,--gc-sections")
       endif()
     endif()
   endif()
 endfunction(add_link_opts)
 
 # Set each output directory according to ${CMAKE_CONFIGURATION_TYPES}.
 # Note: Don't set variables CMAKE_*_OUTPUT_DIRECTORY any more,
-# or a certain builder, for eaxample, msbuild.exe, would be confused.
+# or a certain builder, for example, msbuild.exe, would be confused.
 function(set_output_directory target)
   cmake_parse_arguments(ARG "" "BINARY_DIR;LIBRARY_DIR" "" ${ARGN})
 
   # module_dir -- corresponding to LIBRARY_OUTPUT_DIRECTORY.
   # It affects output of add_library(MODULE).
   if(WIN32 OR CYGWIN)
     # DLL platform
     set(module_dir ${ARG_BINARY_DIR})
   else()
     set(module_dir ${ARG_LIBRARY_DIR})
   endif()
   if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
     foreach(build_mode ${CMAKE_CONFIGURATION_TYPES})
       string(TOUPPER "${build_mode}" CONFIG_SUFFIX)
       if(ARG_BINARY_DIR)
         string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} bi ${ARG_BINARY_DIR})
         set_target_properties(${target} PROPERTIES "RUNTIME_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${bi})
       endif()
       if(ARG_LIBRARY_DIR)
         string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} li ${ARG_LIBRARY_DIR})
         set_target_properties(${target} PROPERTIES "ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${li})
       endif()
       if(module_dir)
         string(REPLACE ${CMAKE_CFG_INTDIR} ${build_mode} mi ${module_dir})
         set_target_properties(${target} PROPERTIES "LIBRARY_OUTPUT_DIRECTORY_${CONFIG_SUFFIX}" ${mi})
function(add_llvm_tool_symlink link_name target)
   # and replace it with CMAKE_CFG_INTDIR. This allows the build step to be type
   # agnostic again. 
   if(NOT ARG_OUTPUT_DIR)
     # If you're not overriding the OUTPUT_DIR, we can make the link relative in
     # the same directory.
     if(UNIX)
       set(dest_binary "$<TARGET_FILE_NAME:${target}>")
     endif()
-    if(CMAKE_CONFIGURATION_TYPES)
+    if(CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
       list(GET CMAKE_CONFIGURATION_TYPES 0 first_type)
       string(TOUPPER ${first_type} first_type_upper)
       set(first_type_suffix _${first_type_upper})
     endif()
     get_target_property(target_type ${target} TYPE)
     if(${target_type} STREQUAL "STATIC_LIBRARY")
       get_target_property(ARG_OUTPUT_DIR ${target} ARCHIVE_OUTPUT_DIRECTORY${first_type_suffix})
     elseif(UNIX AND ${target_type} STREQUAL "SHARED_LIBRARY")
       get_target_property(ARG_OUTPUT_DIR ${target} LIBRARY_OUTPUT_DIRECTORY${first_type_suffix})
     else()
       get_target_property(ARG_OUTPUT_DIR ${target} RUNTIME_OUTPUT_DIRECTORY${first_type_suffix})
     endif()
-    if(CMAKE_CONFIGURATION_TYPES)
+    if(CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
       string(FIND "${ARG_OUTPUT_DIR}" "/${first_type}/" type_start REVERSE)
       string(SUBSTRING "${ARG_OUTPUT_DIR}" 0 ${type_start} path_prefix)
       string(SUBSTRING "${ARG_OUTPUT_DIR}" ${type_start} -1 path_suffix)
       string(REPLACE "/${first_type}/" "/${CMAKE_CFG_INTDIR}/"
              path_suffix ${path_suffix})
       set(ARG_OUTPUT_DIR ${path_prefix}${path_suffix})
     endif()
   endif()