[cpp-msbuild] branch master updated: SSPCPP-765 bugfixing the Santuario X86 Release build

Rod Widdowson rdw at steadingsoftware.com
Sun Nov 26 09:57:41 EST 2017


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=4ceeafe9f7043198a54f35c0db840b00fc0d10f6

The following commit(s) were added to refs/heads/master by this push:
       new  4ceeafe   SSPCPP-765 bugfixing the Santuario X86 Release build
4ceeafe is described below

commit 4ceeafe9f7043198a54f35c0db840b00fc0d10f6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Nov 26 14:51:52 2017 +0000

    SSPCPP-765 bugfixing the Santuario X86 Release build
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 dependencies/dependency.make | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 4eec9fd..0a105d5 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -13,7 +13,7 @@ MsBuildArch=Win32
 XsecBuildArch=Win32
 CMakeArch=Visual Studio 15 2017
 XercesBuildDir=Buildx86
-XercesInstallDir=Install86\VC15
+XercesInstallDir=Install32\VC15
 !elseif "$(VSCMD_ARG_TGT_ARCH)" == "x64"
 !message Building x64
 OpenSSLName=WIN64A
@@ -262,12 +262,12 @@ xerces-test: test-env $(ROOT_DIR)\$(XERCES_DIR)\CMakeLists.txt
 xerces-clean:
 	-92 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Buildx64
 	-92 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Buildx86
-	-92 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install86
+	-92 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install32
 	-92 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install64
 # twice because of AV's making directories not empty fast enough - so this can fail
 	-2 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Buildx64
 	-2 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Buildx86
-	-2 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install86
+	-2 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install32
 	-2 rd/s/q $(ROOT_DIR)\$(XERCES_DIR)\Install64
 
 $(ROOT_DIR)\$(XERCES_DIR)\$(XercesInstallDir)\bin\xerces-c_3_2D.dll: $(ROOT_DIR)\$(XERCES_DIR)\$(XercesBuildDir)\ALL_BUILD.vcxproj
@@ -345,4 +345,4 @@ xsec-release: test-env openssl-release xerces-release
 	title Build XmlSecurity $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(XSEC_DIR)
 	set ForceImportBeforeCppTargets=$(ROOT_DIR)\cpp-msbuild\dependencies\xsec.props
-	msbuild /m projects\VC15.0\xsec\xsec.sln /p:Configuration="Debug Minimal" /m  /t:Build /p:Platform=$(XsecBuildArch)
\ No newline at end of file
+	msbuild /m projects\VC15.0\xsec\xsec.sln /p:Configuration="Release Minimal" /m  /t:Build /p:Platform=$(XsecBuildArch)
\ No newline at end of file

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


More information about the commits mailing list