Skip to content

Commit

Permalink
[Ticket #13248] Ensure all solutions build
Browse files Browse the repository at this point in the history
[Requirement #13239] Ensure the source code repository is managed correctly
* Updated viewer samples solution to VS2013 format (backward compatible to 2010)
* Updated viewer samples solution to support a native x64 build.
* Removed the ITK sample plugin from x64 builds due to a lack of an x64
  ManagedITK build.
* Moved the viewer samples solution to the Samples directory, to make it easier
  to find.
* Fixed various paths and outdated items in the build scripts and solutions.

--HG--
branch : Spock
rename : ImageViewer/ImageViewerSamples.sln => Samples/ImageViewerSamples.sln
rename : ImageViewer/ImageViewerSamples_dist.proj => Samples/ImageViewerSamples_dist.proj
  • Loading branch information
jasper-yeh committed Mar 20, 2015
1 parent 53f0287 commit 5348d82
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 183 deletions.
8 changes: 7 additions & 1 deletion Desktop/Executable/PostBuild_dist.proj
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,13 @@
<GetFrameworkSdkPath>
<Output TaskParameter="Path" PropertyName="SdkPath" />
</GetFrameworkSdkPath>
<Exec Command="corflags /Force /32BIT+ &quot;$(DistributionDirectory)\ClearCanvas.Desktop.Executable.exe&quot;" WorkingDirectory="$(SdkPath)\bin\" />
<CreateProperty Value="$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\@CurrentInstallFolder)" Condition="'$(SdkPath)' == ''">
<Output TaskParameter="Value" PropertyName="SdkPath" />
</CreateProperty>
<CreateProperty Value="$(SdkPath)\" Condition="!HasTrailingSlash('$(SdkPath)')">
<Output TaskParameter="Value" PropertyName="SdkPath" />
</CreateProperty>
<Exec Command="corflags /Force /32BIT+ &quot;$(DistributionDirectory)\ClearCanvas.Desktop.Executable.exe&quot;" WorkingDirectory="$(SdkPath)bin\" />
</Target>

<!-- Flags the CIL desktop executable as capable of handling extended process memory space ("large addresses") if the OS is configured to do so -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@
<Project>{85100D3E-471C-47C9-9687-ABF25F617ED7}</Project>
<Name>ClearCanvas.ImageViewer</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\ClearCanvas.ImageViewer.Common.csproj">
<Project>{fefd73c5-8541-47d2-bbdb-ff61dea28291}</Project>
<Name>ClearCanvas.ImageViewer.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\VTK\ClearCanvas.ImageViewer.VTK.csproj">
<Project>{14FE088A-252E-4214-94B6-FC9D62C9BF0E}</Project>
<Name>ClearCanvas.ImageViewer.VTK</Name>
Expand Down
Loading

0 comments on commit 5348d82

Please sign in to comment.