aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-03-13 14:08:40 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-03-13 14:09:11 -0700
commit26b9278a4c73eebb2bf21beccac168d603206126 (patch)
tree3e94b3a7eaad533e35e437d8e60de0236bafde3d
parentf44063289412d46187ce72061e8e474e90f1cc63 (diff)
downloadvcpkg-26b9278a4c73eebb2bf21beccac168d603206126.tar.gz
vcpkg-26b9278a4c73eebb2bf21beccac168d603206126.zip
[vcpkg_build_msbuild] Perform a full rebuild by default.
-rw-r--r--scripts/cmake/vcpkg_build_msbuild.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index d143a6a81..748b47b7b 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -24,6 +24,8 @@
# used for Debug builds.
# ``TARGET_PLATFORM_VERSION``
# The WindowsTargetPlatformVersion (``/p:WindowsTargetPlatformVersion`` msbuild parameter)
+# ``TARGET``
+# The MSBuild target to build. (``/t:<TARGET>``)
# ``PLATFORM``
# The platform (``/p:Platform`` msbuild parameter)
# used for the build.
@@ -35,8 +37,9 @@
# The options passed to msbuild for Debug builds.
#
+
function(vcpkg_build_msbuild)
- cmake_parse_arguments(_csc "" "PROJECT_PATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;TARGET_PLATFORM_VERSION" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" ${ARGN})
+ cmake_parse_arguments(_csc "" "PROJECT_PATH;RELEASE_CONFIGURATION;DEBUG_CONFIGURATION;PLATFORM;TARGET_PLATFORM_VERSION;TARGET" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG" ${ARGN})
if(NOT DEFINED _csc_RELEASE_CONFIGURATION)
set(_csc_RELEASE_CONFIGURATION Release)
@@ -50,8 +53,12 @@ function(vcpkg_build_msbuild)
if(NOT DEFINED _csc_TARGET_PLATFORM_VERSION)
vcpkg_get_windows_sdk(_csc_TARGET_PLATFORM_VERSION)
endif()
+ if(NOT DEFINED _csc_TARGET)
+ set(_csc_TARGET Rebuild)
+ endif()
list(APPEND _csc_OPTIONS
+ /t:${_csc_TARGET}
/p:Platform=${_csc_PLATFORM}
/p:VCPkgLocalAppDataDisabled=true
/p:UseIntelMKL=No