Skip to content

[CMake] Fix dependency on the build directory #32870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davezarzycki merged 1 commit into from
Jul 19, 2020
Merged

[CMake] Fix dependency on the build directory #32870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,10 @@ function(get_test_dependencies SDK result_var_name)
message(FATAL_ERROR "Unknown SDK: ${SDK}")
endif()

if(XCODE)
# Xcode's build paths have a configuration variable in them,
# so CMake can't match them at compile time. Just use target names.
list(APPEND deps ${deps_binaries})
else()
foreach(binary ${deps_binaries})
list(APPEND deps "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/${binary}${CMAKE_EXECUTABLE_SUFFIX}")
endforeach()
endif()
# Just use target names for dependency generation. This works for both Xcode
# and non-Xcode build systems. In the case of Xcode, its build paths have a
# configuration variable in them, so CMake can't match them at compile time.
list(APPEND deps ${deps_binaries})

set("${result_var_name}" "${deps}" PARENT_SCOPE)
endfunction()
Expand Down