Skip to content

Commit

Permalink
is cl even *in* %PATH% when buildilng w/ VSTest@1?
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpryor committed Mar 5, 2021
1 parent c6d06a9 commit 6da1e49
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ jobs:
msbuildArguments: /restore /t:Prepare

- task: VSBuild@1
displayName: MSBuild Java.Interop.sln
displayName: VSBuild Java.Interop.sln
inputs:
solution: Java.Interop.sln
configuration: $(Build.Configuration)
msbuildArguments: /restore
msbuildArgs: /restore

- task: MSBuild@1
displayName: MSBuild RunNUnitTests.targets
Expand Down
8 changes: 8 additions & 0 deletions tests/NativeTiming/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,18 @@
</PropertyGroup>
<PropertyGroup>
<_JdkDirs>"-DJDK_INCLUDE_LIST=@(JdkIncludePath, ';')"</_JdkDirs>
<!--
<_Cc Condition=" '$(_ClPath)' != '' " >"-DCMAKE_C_COMPILER=$(_ClPath)"</_Cc>
-->
<_CmakeGenerator Condition=" '$(OS)' != 'Windows_NT' ">-G "Unix Makefiles"</_CmakeGenerator>
<_CmakeGenerator Condition=" '$(OS)' == 'Windows_NT' ">-G "NMake Makefiles"</_CmakeGenerator>
</PropertyGroup>
<!-- does `cl` work? is it in %PATH%? -->
<Exec
Condition=" '$(OS)' == 'Windows_NT' "
ContinueOnError="WarnAndContinue"
Command="cl /?"
/>
<Exec
ContinueOnError="WarnAndContinue"
Command="$(CmakePath) $(_CmakeGenerator) -S . -B $(IntermediateOutputPath) $(_JdkDirs) $(_Cc)"
Expand Down

0 comments on commit 6da1e49

Please sign in to comment.