From bca66be475395c7fa09745d18d83ab92f22a0721 Mon Sep 17 00:00:00 2001
From: Mark Winter <mwinter@drexel.edu>
Date: Fri, 13 Sep 2013 20:35:54 -0400
Subject: [PATCH] Changed hematoseg and cropper projects to use dependency
environment variables.
---
src/c/GrayScaleCrop.vcxproj | 8 ++++----
src/c/HematoSeg.vcxproj | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/c/GrayScaleCrop.vcxproj b/src/c/GrayScaleCrop.vcxproj
index 715128f8..eebe1f92 100644
--- a/src/c/GrayScaleCrop.vcxproj
+++ b/src/c/GrayScaleCrop.vcxproj
@@ -108,12 +108,12 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>C:\Program Files\ITK\include\ITK-4.0</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%ITK_DIR%\include\ITK-4.0</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>C:\Program Files\ITK\lib\debug;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%ITK_DIR%\lib\debug;</AdditionalLibraryDirectories>
<AdditionalDependencies>ITKStatistics-4.0.lib;itkzlib-4.0.lib;itksys-4.0.lib;itkvnl-4.0.lib;itkvnl_algo-4.0.lib;ITKVNLInstantiation-4.0.lib;itkv3p_netlib-4.0.lib;ITKMetaIO-4.0.lib;ITKIOMeta-4.0.lib;ITKIOImageBase-4.0.lib;ITKIOTIFF-4.0.lib;itktiff-4.0.lib;itkjpeg-4.0.lib;ITKCommon-4.0.lib;shlwapi.lib;winmm.lib;Advapi32.lib;User32.lib;Gdi32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
@@ -143,14 +143,14 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>C:\Program Files\ITK\include\ITK-4.0</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%ITK_DIR%\include\ITK-4.0</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>C:\Program Files\ITK\lib\release;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%ITK_DIR%\lib\release;</AdditionalLibraryDirectories>
<AdditionalDependencies>ITKStatistics-4.0.lib;itkzlib-4.0.lib;itksys-4.0.lib;itkvnl-4.0.lib;itkvnl_algo-4.0.lib;ITKVNLInstantiation-4.0.lib;itkv3p_netlib-4.0.lib;ITKMetaIO-4.0.lib;ITKIOMeta-4.0.lib;ITKIOImageBase-4.0.lib;ITKIOTIFF-4.0.lib;itktiff-4.0.lib;itkjpeg-4.0.lib;ITKCommon-4.0.lib;shlwapi.lib;winmm.lib;Advapi32.lib;User32.lib;Gdi32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
diff --git a/src/c/HematoSeg.vcxproj b/src/c/HematoSeg.vcxproj
index c238e203..e1ab0029 100644
--- a/src/c/HematoSeg.vcxproj
+++ b/src/c/HematoSeg.vcxproj
@@ -122,7 +122,7 @@ copy /Y $(OutDir)$(ProjectName).pdb ..\..\bin
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>C:\Program Files\ITK\include\ITK-4.0;C:\Program Files\qhull\include\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%ITK_DIR%\include\ITK-4.0;%QHULL_DIR%\include\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
@@ -131,7 +131,7 @@ copy /Y $(OutDir)$(ProjectName).pdb ..\..\bin
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>C:\Program Files\ITK\lib\debug;C:\Program Files\MATLAB\R2011b\extern\lib\win64\microsoft;C:\Program Files\qhull\lib\debug</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%ITK_DIR%\lib\debug;C:\Program Files\MATLAB\R2011b\extern\lib\win64\microsoft;%QHULL_DIR%\lib\debug</AdditionalLibraryDirectories>
<AdditionalDependencies>ITKStatistics-4.0.lib;itkzlib-4.0.lib;itksys-4.0.lib;itkvnl-4.0.lib;itkvnl_algo-4.0.lib;ITKVNLInstantiation-4.0.lib;itkv3p_netlib-4.0.lib;ITKMetaIO-4.0.lib;ITKIOMeta-4.0.lib;ITKIOImageBase-4.0.lib;ITKIOTIFF-4.0.lib;itktiff-4.0.lib;itkjpeg-4.0.lib;ITKCommon-4.0.lib;ITKLabelMap-4.0.lib;qhullcpp.lib;qhullstatic.lib;qhull6.lib;qhullstatic_p.lib;shlwapi.lib;winmm.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
</Link>
<PostBuildEvent>
@@ -172,7 +172,7 @@ copy /Y $(OutDir)$(ProjectName).pdb ..\..\bin
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <AdditionalIncludeDirectories>C:\Program Files\ITK\include\ITK-4.0;C:\Program Files\qhull\include\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>%ITK_DIR%\include\ITK-4.0;%QHULL_DIR%\include\libqhull;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
@@ -183,7 +183,7 @@ copy /Y $(OutDir)$(ProjectName).pdb ..\..\bin
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
- <AdditionalLibraryDirectories>C:\Program Files\ITK\lib\release;C:\Program Files\MATLAB\R2011b\extern\lib\win64\microsoft;C:\Program Files\qhull\lib\release;</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%ITK_DIR%\lib\release;C:\Program Files\MATLAB\R2011b\extern\lib\win64\microsoft;%QHULL_DIR%\lib\release</AdditionalLibraryDirectories>
<AdditionalDependencies>ITKStatistics-4.0.lib;itkzlib-4.0.lib;itksys-4.0.lib;itkvnl-4.0.lib;itkvnl_algo-4.0.lib;ITKVNLInstantiation-4.0.lib;itkv3p_netlib-4.0.lib;ITKMetaIO-4.0.lib;ITKIOMeta-4.0.lib;ITKIOImageBase-4.0.lib;ITKIOTIFF-4.0.lib;itktiff-4.0.lib;itkjpeg-4.0.lib;ITKCommon-4.0.lib;ITKLabelMap-4.0.lib;qhullcpp.lib;qhullstatic.lib;qhull6.lib;qhullstatic_p.lib;shlwapi.lib;winmm.lib;Advapi32.lib;User32.lib;Gdi32.lib</AdditionalDependencies>
</Link>
<PostBuildEvent>
--
GitLab