Import 2017-06-07 23:51:09: master 41df9c1a

Author Committer Branch Timestamp Parent
jcfr jcfr master 2016-10-12 23:50:40 master c226f731
Affected Issues 0004247: Extensions do not get built on Windows if any test in the dependent extensions fail
Changeset

BUG: Extension build system: Fix use of wrapper script on windows. Fixes 0004247

This commit ensures the build configuration is passed to the wrapped
command.

It fixes error like this one:

8: SetMakeCommand:C:\D\Support\CMake-3.5.0-rc3\bin\cmake.exe --build . --config "$(Configuration)"
8:
8: SetCTestConfiguration:MakeCommand:C:\D\Support\CMake-3.5.0-rc3\bin\cmake.exe --build . --config "$(Configuration)"
8:
8: Build project
8:
8: MakeCommand:C:\D\Support\CMake-3.5.0-rc3\bin\cmake.exe --build . --config "$(Configuration)"
8: Run command: "C:\D\Support\CMake-3.5.0-rc3\bin\cmake.exe" "--build" "." "--config" "$(Configuration)"
8:
8: Microsoft (R) Build Engine version 12.0.40629.0
8: [Microsoft .NET Framework, version 4.0.30319.34209]
8: Copyright (C) Microsoft Corporation. All rights reserved.
8: Build started 10/12/2016 10:57:46 PM.
8:
8: Project "C:\D\N\Slicer-1-build\Slicer-build\Extensions\CMake\Testing\build_with_upload-build\TestExtA-build\ALL_BUILD.vcxproj" on node 1 (default targets).
8: Project "C:\D\N\Slicer-1-build\Slicer-build\Extensions\CMake\Testing\build_with_upload-build\TestExtA-build\ALL_BUILD.vcxproj" (1) is building "C:\D\N\Slic
er-1-build\Slicer-build\Extensions\CMake\Testing\build_with_upload-build\TestExtA-build\ZERO_CHECK.vcxproj" (2) on node 1 (default targets).
8:
8:
8: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V120\Microsoft.Cpp.Platform.targets(61,5): error MSB8013: This project doesn't contain the Configuration an
d Platform combination of $(Configuration)|x64. [C:\D\N\Slicer-1-build\Slicer-build\Extensions\CMake\Testing\build_with_upload-build\TestExtA-build\ZERO_CHECK.v
cxproj] [C:\D\N\Slicer-1-build\Slicer-build\Extensions\CMake\Testing\build_with_upload-build\TestExtA.vcxproj]
8:

git-svn-id: http://svn.slicer.org/Slicer4/trunk@25440 3bd1e089-480b-0410-8dfb-8563597acbee

mod - Extensions/CMake/SlicerBlockBuildPackageAndUploadExtensions.cmake Diff File
mod - Extensions/CMake/SlicerBlockUploadExtension.cmake Diff File