diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-11 17:01:13 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-06-11 17:01:13 -0700 |
| commit | db3004459ff856e7c0142d94c84832e6bf6199a3 (patch) | |
| tree | a1974cc35e3698d9e3b678b294395dfe219d7612 | |
| parent | 82f53ac82c2f36fc41cc0c57c57e0f1323dd43a9 (diff) | |
| download | vcpkg-db3004459ff856e7c0142d94c84832e6bf6199a3.tar.gz vcpkg-db3004459ff856e7c0142d94c84832e6bf6199a3.zip | |
Improve disableMetrics propagation when consuming CMakeLists directly
| -rw-r--r-- | scripts/bootstrap.sh | 4 | ||||
| -rw-r--r-- | toolsrc/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index e883f5476..478183372 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -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 diff --git a/toolsrc/CMakeLists.txt b/toolsrc/CMakeLists.txt index 555b3e751..abfd872d2 100644 --- a/toolsrc/CMakeLists.txt +++ b/toolsrc/CMakeLists.txt @@ -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)
|