Index: cmake/modules/AddLLVM.cmake =================================================================== --- cmake/modules/AddLLVM.cmake +++ cmake/modules/AddLLVM.cmake @@ -200,7 +200,7 @@ # 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}) @@ -1322,7 +1322,7 @@ if(UNIX) set(dest_binary "$") 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}) @@ -1335,7 +1335,7 @@ 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)