diff options
| author | Christophe Calmejane <christophe.calmejane@l-acoustics.com> | 2020-08-08 01:14:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 16:14:05 -0700 |
| commit | 60bb798ceb2e5ba2eeca837144237c6808463122 (patch) | |
| tree | 542afc8fee89adc9d6d17d3f0b8a1caef198a80d /ports | |
| parent | 80fae15c0360462afeaeb1e1a4c53d3ddbd2711b (diff) | |
| download | vcpkg-60bb798ceb2e5ba2eeca837144237c6808463122.tar.gz vcpkg-60bb798ceb2e5ba2eeca837144237c6808463122.zip | |
[vcpkg] Improving android support (#12634)
* Fix for Android compilation
See https://github.com/microsoft/vcpkg/issues/5809
* Allow for custom android triplets. Fallback to Xamarin installed NDK.
* Increased Port-Version for boost-modular-build-helper
* More restrictive matching pattern for android toolchain
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/boost-modular-build-helper/CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 0ebd3812c..629e01f6d 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -97,7 +97,11 @@ if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET) endif()
endif()
if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
- set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+ set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ else()
+ set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} <compileflags>${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
+ endif()
endif()
if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT)
set(CXXFLAGS "${CXXFLAGS} <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}")
|