Skip to content

Revert "Use / instead of \ in LLVM_DIR on all platforms" #79

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
steven-johnson merged 1 commit into from
Aug 6, 2020
Merged

Revert "Use / instead of \ in LLVM_DIR on all platforms" #79

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
6 changes: 2 additions & 4 deletions master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,10 @@ def get_cmake_options(os):

def get_halide_cmake_definitions(os, config, halide_target='host'):
cmake_definitions = {
# todo: remove Clang_DIR line when halide/Halide#5135 lands
# Use "CMake paths" which always use forward slashes, even on Windows.
'LLVM_DIR': get_llvm_install_path(config, 'lib/cmake/llvm').replace('\\', '/'),
'Clang_DIR': get_llvm_install_path(config, 'lib/cmake/clang').replace('\\', '/'),
'Clang_DIR': get_llvm_install_path(config, 'lib/cmake/clang'),
'CMAKE_BUILD_TYPE': config,
'Halide_TARGET': halide_target,
'LLVM_DIR': get_llvm_install_path(config, 'lib/cmake/llvm'),
}

# The linux and arm linux buildbots have ccache installed
Expand Down