diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-08 18:01:35 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-08 18:40:20 -0700 |
| commit | 9508d4aad228531661d6084267449f9fb2452d28 (patch) | |
| tree | 0679049b470a537a8e65b838fe71bb4e840070b0 | |
| parent | 895b73265b0c3ae20c5ccdba15706f90c2b5302f (diff) | |
| download | vcpkg-9508d4aad228531661d6084267449f9fb2452d28.tar.gz vcpkg-9508d4aad228531661d6084267449f9fb2452d28.zip | |
Add -disableMetrics for linux
| -rw-r--r-- | scripts/bootstrap.sh | 13 | ||||
| -rw-r--r-- | toolsrc/CMakeLists.txt | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index e999fa55e..e883f5476 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,5 +1,16 @@ #!/bin/sh +vcpkgDisableMetrics="0" +for var in "$@" +do + if [ "$var" = "-disableMetrics" ]; then + vcpkgDisableMetrics="1" + else + echo "Unknown argument $var" + exit 1 + fi +done + # Find vcpkg-root vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do @@ -190,7 +201,7 @@ buildDir="$vcpkgRootDir/toolsrc/build.rel" rm -rf "$buildDir" mkdir -p "$buildDir" -(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe") +(cd "$buildDir" && CXX=$CXX "$cmakeExe" .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DDEFINE_DISABLE_METRICS=$vcpkgDisableMetrics") (cd "$buildDir" && "$cmakeExe" --build .) rm -rf "$vcpkgRootDir/vcpkg" diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index db756deee..555b3e751 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.3)
project(vcpkg C CXX)
+OPTION(DEFINE_DISABLE_METRICS "Option for disabling metrics" "0")
+
if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(GCC 1)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
@@ -31,7 +33,7 @@ endif() file(GLOB_RECURSE VCPKGLIB_SOURCES src/vcpkg/*.cpp)
add_executable(vcpkg src/vcpkg.cpp ${VCPKGLIB_SOURCES})
-target_compile_definitions(vcpkg PRIVATE -DDISABLE_METRICS=0)
+target_compile_definitions(vcpkg PRIVATE -DDISABLE_METRICS=${DEFINE_DISABLE_METRICS})
target_include_directories(vcpkg PRIVATE include)
if(GCC)
|