Repository: geode-native Updated Branches: refs/heads/develop 62f0e3872 -> 37a0e008b
GEODE-2467: Switch Xerces CMakeLists.txt to highest supported Visual Studio version. - Also move MSVC_VERSION check above if (WIN32) check - This change allows building Xerces with Visual Studio 2015 (called 14.0 internally). This closes #7. Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/37a0e008 Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/37a0e008 Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/37a0e008 Branch: refs/heads/develop Commit: 37a0e008b718156f5b01215add30471b9513cccd Parents: 62f0e38 Author: Mike Martell <[email protected]> Authored: Mon Feb 13 19:57:53 2017 -0800 Committer: Jacob Barrett <[email protected]> Committed: Tue Feb 14 11:19:35 2017 -0800 ---------------------------------------------------------------------- src/dependencies/xerces-c/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode-native/blob/37a0e008/src/dependencies/xerces-c/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/src/dependencies/xerces-c/CMakeLists.txt b/src/dependencies/xerces-c/CMakeLists.txt index 0bfe68e..b1ee30b 100644 --- a/src/dependencies/xerces-c/CMakeLists.txt +++ b/src/dependencies/xerces-c/CMakeLists.txt @@ -23,6 +23,12 @@ set( ${PROJECT_NAME}_EXTERN ${PROJECT_NAME}-extern ) set ( ${PROJECT_NAME}_CFLAGS "${${PROJECT_NAME}_CFLAGS} ${CFLAGS_ARCH}" ) set ( ${PROJECT_NAME}_CXXFLAGS "${${PROJECT_NAME}_CXXFLAGS} ${CXXFLAGS_ARCH} ${CXXFLAGS_C++}" ) + + if (MSVC_VERSION GREATER 14) + # Only have project files for VS14 and older + set(MSVC_VERSION 14) + endiF() + if (WIN32) if (64 EQUAL ${BUILD_BITS}) set( _PLATFORM x64 ) @@ -32,11 +38,6 @@ if (WIN32) set( _BUILD_DIR Build/Win32/VC${MSVC_VERSION}/${_DEBUG_OR_RELEASE} ) endif() - if (MSVC_VERSION GREATER 12) - # Only have project files for VS12 and older - set(MSVC_VERSION 12) - endiF() - set ( _CONFIGURE_COMMAND "" ) set ( _BUILD_COMMAND ${MSBUILD} projects\\Win32\\VC${MSVC_VERSION}\\xerces-all\\xerces-all.sln /m /p:Configuration=${_DEBUG_OR_RELEASE} /p:Platform=${_PLATFORM} ) set ( _INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${_BUILD_DIR}/xerces-c_3_1$<$<CONFIG:Debug>:D>.dll <INSTALL_DIR>/bin/xerces-c_3_1$<$<CONFIG:Debug>:D>.dll
