[cpp-msbuild] 02/02: More xerces CMAKE support

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=f399ff0a2a41c7eb8e03cd6d7ada3443b8e60ec2

commit f399ff0a2a41c7eb8e03cd6d7ada3443b8e60ec2
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Aug 21 15:31:47 2017 +0100

    More xerces CMAKE support
    
    1) Adjust the sanutarion property file to deal with xerces cmake build
    2) Turn on parallel make in santuario while we are at it
    3) Fix typo in compile file
---
 dependencies/xmlsec-compile.bat | 10 +++++-----
 dependencies/xsec.props         | 22 +++++++++++++---------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/dependencies/xmlsec-compile.bat b/dependencies/xmlsec-compile.bat
index f7a4e0d..b3db5c3 100644
--- a/dependencies/xmlsec-compile.bat
+++ b/dependencies/xmlsec-compile.bat
@@ -1,15 +1,15 @@
-rem xmlsec-compile Win64 
+rem xmlsec-compile x64 
 rem xmlsec-compile Win32
 
 set ForceImportBeforeCppTargets=%SCRIPTS_DIR%\xsec.props
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan" /m    /t:clean /p:Platform=%1%
 @if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:clean /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan" /m  /t:clean /p:Platform=%1%
 @if errorlevel 1 goto end
 
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan"     /t:Rebuild /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Debug No Xalan" /m    /t:Build /p:Platform=%1%
 @if errorlevel 1 goto end
-msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan"   /t:Rebuild /p:Platform=%1%
+msbuild /m projects\VC%MsVCVersionNum%.0\xsec\xsec.sln /p:Configuration="Release No Xalan" /m  /t:Build /p:Platform=%1%
 @if errorlevel 1 goto end
 
 
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index ae2be11..87cbd34 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -3,21 +3,24 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86Debug\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc32.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x86Debug\include;$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86Debug\lib;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out32dll.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x86Debug\lib;</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </Link>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64Debug\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc64.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x64Debug\include;$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64Debug\lib;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\install64\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out64dll.dbg;$(ROOT_DIR)$(OpenSSl_dir)\x64Debug\lib;</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies);$(SSLLibD)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -25,10 +28,11 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc32;$(ROOT_DIR)$(OpenSSl_dir)\x86\include;$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x86\lib;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install32\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out32dll;$(ROOT_DIR)$(OpenSSl_dir)\x86\lib;</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies);$(SSLLib)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -36,10 +40,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1;SUPPRESS_XSEC_HAVE_WINCAPI=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
-    </ClCompile>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ROOT_DIR)$(OpenSSl_dir)\inc64;$(ROOT_DIR)$(OpenSSl_dir)\x64\include;$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>    </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\$(MsVCVersion)\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\x64\lib;</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(ROOT_DIR)$(Xerces_dir)\Install64\$(MsVCVersion)\lib;$(ROOT_DIR)$(Openssl_dir)\out64dll;$(ROOT_DIR)$(OpenSSl_dir)\x64\lib;</AdditionalLibraryDirectories>
       <AdditionalDependencies>%(AdditionalDependencies);;$(SSLLib)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.