Commit d1011629 authored by Alexander Barkov's avatar Alexander Barkov

Adding separate flags to disable MSXML and LIBXML2 libraries on Windows:

-DCONNECT_WITH_LIBXML2=0
-DCONNECT_WITH_MSXML=0

modified:
  storage/connect/CMakeLists.txt
parent 627d046d
...@@ -64,9 +64,9 @@ ENDIF(UNIX) ...@@ -64,9 +64,9 @@ ENDIF(UNIX)
# XML # XML
# #
OPTION(CONNECT_WITH_XML "Compile CONNECT storage engine with XML support" ON) OPTION(CONNECT_WITH_LIBXML2 "Compile CONNECT storage engine with LIBXML2 support" ON)
IF(CONNECT_WITH_XML) IF(CONNECT_WITH_LIBXML2)
IF(WIN32) IF(WIN32)
# Adding some typical places to search in # Adding some typical places to search in
SET(PC_LIBXML_INCLUDE_DIRS SET(PC_LIBXML_INCLUDE_DIRS
...@@ -84,8 +84,13 @@ IF(CONNECT_WITH_XML) ...@@ -84,8 +84,13 @@ IF(CONNECT_WITH_XML)
SET(XML_LIBRARY ${LIBXML2_LIBRARIES}) SET(XML_LIBRARY ${LIBXML2_LIBRARIES})
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabxml.cpp plgxml.cpp libdoc.cpp) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabxml.cpp plgxml.cpp libdoc.cpp)
add_definitions(-DXML_SUPPORT) add_definitions(-DXML_SUPPORT)
ENDIF(LIBXML2_FOUND)
ENDIF(CONNECT_WITH_LIBXML2)
IF(WIN32)
IF(WIN32)
OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON)
IF(CONNECT_WITH_MSXML)
find_library(MSXML_LIBRARY find_library(MSXML_LIBRARY
NAMES msxml6 msxml4 msxml3 msxml2 NAMES msxml6 msxml4 msxml3 msxml2
PATHS PATHS
...@@ -113,10 +118,8 @@ IF(CONNECT_WITH_XML) ...@@ -113,10 +118,8 @@ IF(CONNECT_WITH_XML)
ELSE() ELSE()
message(STATUS "msxml? library not found") message(STATUS "msxml? library not found")
ENDIF() ENDIF()
ENDIF(WIN32) ENDIF(CONNECT_WITH_MSXML)
ENDIF(WIN32)
ENDIF(LIBXML2_FOUND)
ENDIF(CONNECT_WITH_XML)
# #
......
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