diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-25 12:48:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 12:48:07 -0800 |
| commit | a3ea74b9ed174c4682243114e98b4e4d460e1383 (patch) | |
| tree | 863135ca41bdb1cfb29949a895ff525aec1ca103 /scripts/cmake | |
| parent | fec269d594723bf605a1d65b0fb05f869d954906 (diff) | |
| parent | 89983fe102520c7a063ff349ac824995b1832a97 (diff) | |
| download | vcpkg-a3ea74b9ed174c4682243114e98b4e4d460e1383.tar.gz vcpkg-a3ea74b9ed174c4682243114e98b4e4d460e1383.zip | |
Merge pull request #2250 from AndyM84/master
Adding UnitTest++ Port
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_from_github.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 5730ce39a..b71ab3838 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -54,19 +54,19 @@ function(vcpkg_from_github) set(multipleValuesArgs) cmake_parse_arguments(_vdud "" "${oneValueArgs}" "${multipleValuesArgs}" ${ARGN}) - if(NOT _vdud_OUT_SOURCE_PATH) + if(NOT DEFINED _vdud_OUT_SOURCE_PATH) message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") endif() - if((_vdud_REF AND NOT _vdud_SHA512) OR (NOT _vdud_REF AND _vdud_SHA512)) + if((DEFINED _vdud_REF AND NOT DEFINED _vdud_SHA512) OR (NOT DEFINED _vdud_REF AND DEFINED _vdud_SHA512)) message(FATAL_ERROR "SHA512 must be specified if REF is specified.") endif() - if(NOT _vdud_REPO) + if(NOT DEFINED _vdud_REPO) message(FATAL_ERROR "The GitHub repository must be specified.") endif() - if(NOT _vdud_REF AND NOT _vdud_HEAD_REF) + if(NOT DEFINED _vdud_REF AND NOT DEFINED _vdud_HEAD_REF) message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.") endif() @@ -90,7 +90,7 @@ function(vcpkg_from_github) endif() endmacro() - if(VCPKG_USE_HEAD_VERSION AND NOT _vdud_HEAD_REF) + if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF) message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") set(VCPKG_USE_HEAD_VERSION OFF) endif() |