3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

Improve disableMetrics propagation when consuming CMakeLists directly

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-06-11 17:01:13 -07:00
parent 82f53ac82c
commit db3004459f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/bootstrap.sh
View File

@ -1,10 +1,10 @@
#!/bin/sh
vcpkgDisableMetrics="0"
vcpkgDisableMetrics="OFF"
for var in "$@"
do
if [ "$var" = "-disableMetrics" ]; then
vcpkgDisableMetrics="1"
vcpkgDisableMetrics="ON"
else
echo "Unknown argument $var"
exit 1

10
toolsrc/CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.3)
project(vcpkg C CXX)
OPTION(DEFINE_DISABLE_METRICS "Option for disabling metrics" "0")
OPTION(DEFINE_DISABLE_METRICS "Option for disabling metrics" OFF)
if(CMAKE_COMPILER_IS_GNUXX OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
set(GCC 1)
@ -32,8 +32,14 @@ endif()
file(GLOB_RECURSE VCPKGLIB_SOURCES src/vcpkg/*.cpp)
if (DEFINE_DISABLE_METRICS)
set(DISABLE_METRICS_VALUE "1")
else()
set(DISABLE_METRICS_VALUE "0")
endif()
add_executable(vcpkg src/vcpkg.cpp ${VCPKGLIB_SOURCES})
target_compile_definitions(vcpkg PRIVATE -DDISABLE_METRICS=${DEFINE_DISABLE_METRICS})
target_compile_definitions(vcpkg PRIVATE -DDISABLE_METRICS=${DISABLE_METRICS_VALUE})
target_include_directories(vcpkg PRIVATE include)
if(GCC)