jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't override CLANG_BINARY

Browse source
This commit is contained in:
Jonathan Müller 2018-09-24 16:02:05 +02:00
commit bf872b31d1
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.travis.yml
View file

@ -10,7 +10,7 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
packages: ['g++-5', 'lcov', 'llvm-4.0', 'clang-4.0', 'libclang-4.0-dev'] packages: ['g++-5', 'lcov', 'llvm-4.0', 'clang-4.0', 'libclang-4.0-dev']
env: TOOLSET=g++-5 CPPAST_TEST_GCOV=ON LLVM_VERSION=4.0 LLVM_CONFIG_BINARY=/usr/bin/llvm-config-4.0 env: TOOLSET=g++-5 CPPAST_TEST_GCOV=ON LLVM_CONFIG_BINARY=/usr/bin/llvm-config-4.0
- os: linux - os: linux
dist: trusty dist: trusty
@ -20,12 +20,12 @@ matrix:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
packages: ['g++-4.9', 'g++-5', 'llvm-4.0', 'clang-4.0', 'libclang-4.0-dev'] packages: ['g++-4.9', 'g++-5', 'llvm-4.0', 'clang-4.0', 'libclang-4.0-dev']
env: TOOLSET=clang++-4.0 LLVM_VERSION=4.0 LLVM_CONFIG_BINARY=/usr/bin/llvm-config-4.0 env: TOOLSET=clang++-4.0 LLVM_CONFIG_BINARY=/usr/bin/llvm-config-4.0
- os: osx - os: osx
osx_image: xcode9.2 osx_image: xcode9.2
compiler: clang compiler: clang
env: TOOLSET=clang++ LLVM_VERSION=4.0 env: TOOLSET=clang++
install: install:
- cd ../ - cd ../

4
external/external.cmake vendored
View file

@ -196,9 +196,7 @@ function(_cppast_find_libclang config_tool min_version force)
endif() endif()
# find clang binary in llvm_binary_dir # find clang binary in llvm_binary_dir
if(${force}) # note: never override that binary
unset(CLANG_BINARY CACHE)
endif()
if(NOT CLANG_BINARY) if(NOT CLANG_BINARY)
execute_process(COMMAND ${config_tool} --bindir execute_process(COMMAND ${config_tool} --bindir
OUTPUT_VARIABLE llvm_binary_dir OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_VARIABLE llvm_binary_dir OUTPUT_STRIP_TRAILING_WHITESPACE)