You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by rl...@apache.org on 2018/02/16 11:07:48 UTC
svn commit: r1824446 - in /xerces/c/trunk: .appveyor.yml CMakeLists.txt
doc/build.xml src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
Author: rleigh
Date: Fri Feb 16 11:07:48 2018
New Revision: 1824446
URL: http://svn.apache.org/viewvc?rev=1824446&view=rev
Log:
cmake: Add mfc-debug option
Modified:
xerces/c/trunk/.appveyor.yml
xerces/c/trunk/CMakeLists.txt
xerces/c/trunk/doc/build.xml
xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
Modified: xerces/c/trunk/.appveyor.yml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/.appveyor.yml?rev=1824446&r1=1824445&r2=1824446&view=diff
==============================================================================
--- xerces/c/trunk/.appveyor.yml (original)
+++ xerces/c/trunk/.appveyor.yml Fri Feb 16 11:07:48 2018
@@ -80,6 +80,7 @@ environment:
msgloader: icu
transcoder: windows
xmlch: wchar_t
+ mfc: ON
- compiler: vc14
configuration: Debug
generator: Visual Studio 14 2015 Win64
@@ -89,6 +90,7 @@ environment:
msgloader: inmemory
transcoder: icu
xmlch: char16_t
+ mfc: OFF
cache:
- 'c:\projects\download -> scripts/ci-appveyor-setup'
@@ -126,6 +128,7 @@ before_build:
- if NOT [%msgloader%] == [] set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -Dmessage-loader=%msgloader%"
- if NOT [%transcoder%] == [] set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -Dtranscoder=%transcoder%"
- if NOT [%xmlch%] == [] set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -Dxmlch-type=%xmlch%"
+ - if NOT [%mfc%] == [] set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -Dmfc-debug=%mfc%"
- set "AV_XERCES_CMAKE_SOURCE=%AV_XERCES_SOURCE%"
- set "AV_XERCES_CMAKE_INSTALL=%AV_XERCES_INSTALL%"
- 'if %compiler%==cygwin set "AV_XERCES_CMAKE_SOURCE=%AV_XERCES_CYG_SOURCE%'
Modified: xerces/c/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/xerces/c/trunk/CMakeLists.txt?rev=1824446&r1=1824445&r2=1824446&view=diff
==============================================================================
--- xerces/c/trunk/CMakeLists.txt (original)
+++ xerces/c/trunk/CMakeLists.txt Fri Feb 16 11:07:48 2018
@@ -123,6 +123,7 @@ include(XercesConst)
include(XercesInline)
include(XercesVolatile)
include(XercesLString)
+include(XercesMFC)
include(XercesNamespaces)
include(XercesStdLibs)
include(XercesStdNamespace)
Modified: xerces/c/trunk/doc/build.xml
URL: http://svn.apache.org/viewvc/xerces/c/trunk/doc/build.xml?rev=1824446&r1=1824445&r2=1824446&view=diff
==============================================================================
--- xerces/c/trunk/doc/build.xml (original)
+++ xerces/c/trunk/doc/build.xml Fri Feb 16 11:07:48 2018
@@ -171,6 +171,10 @@
</tr>
</table>
+ <p>MFC debug support is enabled by default (Windows only) and
+ can be disabled with the
+ <code>-Dmfc-debug:BOOL=OFF</code> option.</p>
+
<p>Thread support is enabled by default and can be disabled
with the <code>-Dthreads:BOOL=OFF</code> option. If disabled,
it will not be possible to select a mutex manager other than
Modified: xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in?rev=1824446&r1=1824445&r2=1824446&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in (original)
+++ xerces/c/trunk/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in Fri Feb 16 11:07:48 2018
@@ -72,6 +72,7 @@
#cmakedefine XERCES_NEW_IOSTREAMS 1
#cmakedefine XERCES_NO_NATIVE_BOOL 1
#cmakedefine XERCES_LSTRSUPPORT 1
+#cmakedefine XERCES_MFC_SUPPORT 1
#cmakedefine XERCES_HAVE_CPUID_INTRINSIC 1
#cmakedefine XERCES_HAVE_SSE2_INTRINSIC 1
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org