Commit e5810727 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix msxml6 search in Connect engine on Windows,

as it fails on new builders.

msxml6 is found on all Windows we support, thus there is no reason to
search for it.
parent cf225145
...@@ -128,37 +128,10 @@ IF(WIN32) ...@@ -128,37 +128,10 @@ IF(WIN32)
OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON) OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON)
IF(CONNECT_WITH_MSXML) IF(CONNECT_WITH_MSXML)
find_library(MSXML_LIBRARY add_definitions(-DMSX6 -DDOMDOC_SUPPORT)
NAMES msxml6 msxml4 msxml3 msxml2 message(STATUS "MSXML library version: msxml6")
PATHS SET(MSXML_FOUND 1)
"C:/Program Files/Microsoft SDKs/Windows/v7.0A/Lib" SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
"C:/Program Files/Microsoft SDKs/Windows/v6.0A/Lib"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
DOC "Specify the MSXML? library here."
)
IF(MSXML_LIBRARY MATCHES .*msxml6[.].*)
add_definitions(-DMSX6 -DDOMDOC_SUPPORT)
message(STATUS "MSXML library version: msxml6")
SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml4[.].*)
add_definitions(-DMSX4 -DDOMDOC_SUPPORT)
message("MSXML library version: msxml4")
SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml3[.].*)
message("MSXML library version: msxml3")
add_definitions(-DMSX3 -DDOMDOC_SUPPORT)
SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml2[.].*)
message("MSXML library version: msxml2")
add_definitions(-DMXS2 -DDOMDOC_SUPPORT)
SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSE()
message(STATUS "msxml? library not found")
ENDIF()
ENDIF(CONNECT_WITH_MSXML) ENDIF(CONNECT_WITH_MSXML)
ENDIF(WIN32) ENDIF(WIN32)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment