diff options
| author | soroshsabz <soorosh_abi@hotmail.com> | 2019-04-11 12:02:03 +0430 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-04-11 00:32:03 -0700 |
| commit | 246bd61ba160f5e7c11c90574d60fca440e8883f (patch) | |
| tree | c7bc1634ddb41098f2ffad731cfb828c7380f006 /toolsrc | |
| parent | b625cbf82f792409fa59262546cb5ed1ef7944e3 (diff) | |
| download | vcpkg-246bd61ba160f5e7c11c90574d60fca440e8883f.tar.gz vcpkg-246bd61ba160f5e7c11c90574d60fca440e8883f.zip | |
Add -allowAppleClang option to bootstrap.sh. (fixes #4698) (#5915)
* Add -allowAppleClang option to bootstrap.sh. (fixes #4698)
* [vcpkg-bootstrap] Simplify appleclang changes and reformat
* [vcpkg-bootstrap] Remove enviroment variable VCPKG_ALLOW_APPLE_CLANG
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 706162bd3..e0c4cdd86 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -1,7 +1,9 @@ cmake_minimum_required(VERSION 3.3)
+
project(vcpkg C CXX)
OPTION(DEFINE_DISABLE_METRICS "Option for disabling metrics" OFF)
+OPTION(VCPKG_ALLOW_APPLE_CLANG "Option for allowing apple clang" OFF)
if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(GCC 1)
@@ -11,7 +13,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") "Building the vcpkg tool requires support for the C++ Filesystem TS.
Apple clang versions 9 and below do not have support for it.
Please install gcc6 or newer from homebrew (brew install gcc6).
-If you would like to try anyway, set VCPKG_ALLOW_APPLE_CLANG.")
+If you would like to try anyway, pass --allowAppleClang to bootstrap.sh.")
else()
set(CLANG 1)
endif()
|