11diff --git a/CMakeLists.txt b/CMakeLists.txt
2- index bee6cd581..dbd9a9b37 100644
2+ index 33bc40f41..3eda4500e 100644
33--- a/CMakeLists.txt
44+++ b/CMakeLists.txt
5- @@ -106,7 +106,7 @@ include(XercesIncludes)
6- include(XercesFunctions)
5+ @@ -107,7 +107,7 @@ include(XercesFunctions)
76 include(XercesDLL)
7+ include(XercesIntTypes)
88 include(XercesPathDelimiters)
99- include(XercesICU)
1010+ # include(XercesICU)
1111 include(XercesMutexMgrSelection)
1212 include(XercesNetAccessorSelection)
1313 include(XercesMsgLoaderSelection)
14- @@ -171 ,7 +171 ,7 @@ message(STATUS " Installation directory: ${prefix}")
14+ @@ -181 ,7 +181 ,7 @@ message(STATUS " Installation directory: ${prefix}")
1515 message(STATUS " C compiler: ${CMAKE_C_COMPILER}")
1616 message(STATUS " C++ compiler: ${CMAKE_CXX_COMPILER}")
1717 message(STATUS "")
@@ -27,12 +27,12 @@ index 8ebb8aa09..a69078e64 100644
2727@@ -20,7 +20,7 @@
2828 # Option for selection of shared or static libraries, exported as
2929 # cache variable
30-
30+
3131- set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
3232+ # set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries")
33-
33+
3434 # Add a d postfix to Debug libraries on Windows
35-
35+
3636@@ -35,7 +35,7 @@ set(XERCES_PLATFORM_IMPORT)
3737 set(XERCES_TEMPLATE_EXTERN extern)
3838 set(XERCES_DLL_EXPORT)
@@ -43,13 +43,13 @@ index 8ebb8aa09..a69078e64 100644
4343 else()
4444 if(WIN32)
4545diff --git a/cmake/XercesTranscoderSelection.cmake b/cmake/XercesTranscoderSelection.cmake
46- index 5dd7c6257..6c63df72f 100644
46+ index 4ff5b1621..f239b13a5 100644
4747--- a/cmake/XercesTranscoderSelection.cmake
4848+++ b/cmake/XercesTranscoderSelection.cmake
4949@@ -23,8 +23,11 @@
50-
50+
5151 # ICU
52-
52+
5353- if(ICU_FOUND)
5454- list(APPEND transcoders icu)
5555+ # if(ICU_FOUND)
@@ -58,15 +58,15 @@ index 5dd7c6257..6c63df72f 100644
5858+ if(UNIX AND NOT APPLE)
5959+ set(transcoder iconv)
6060 endif()
61-
61+
6262 # MacOS
6363diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
64- index a168db125..9197034da 100644
64+ index aef3a76f9..9b193dba1 100644
6565--- a/src/CMakeLists.txt
6666+++ b/src/CMakeLists.txt
6767@@ -1075,12 +1075,12 @@ endif()
6868 list(APPEND libxerces_c_SOURCES ${xerces_replacement_funcs})
69-
69+
7070 # NetAccessors, conditionally built based on selection
7171- if(SOCKET_LIBRARY)
7272- list(APPEND libxerces_c_DEPS ${SOCKET_LIBRARY})
@@ -80,7 +80,7 @@ index a168db125..9197034da 100644
8080+ # if(NSL_LIBRARY)
8181+ # list(APPEND libxerces_c_DEPS ${NSL_LIBRARY})
8282+ # endif()
83-
83+
8484 if(XERCES_USE_NETACCESSOR_CURL)
8585 list(APPEND libxerces_c_SOURCES ${curl_sources})
8686@@ -1289,7 +1289,7 @@ elseif(UNIX)
@@ -93,38 +93,37 @@ index a168db125..9197034da 100644
9393 file(GENERATE
9494 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/InstallLibrarySymlink.cmake"
9595diff --git a/cmake/XercesNetAccessorSelection.cmake b/cmake/XercesNetAccessorSelection.cmake
96- index 7a63f1f6b..ecbcd1014 100644
96+ index 7a63f1f6b..886ea4233 100644
9797--- a/cmake/XercesNetAccessorSelection.cmake
9898+++ b/cmake/XercesNetAccessorSelection.cmake
9999@@ -19,9 +19,9 @@
100-
100+
101101 # netaccessor selection
102-
102+
103103- option(network "Network support" ON)
104104+ option(XERCESC_NETWORK "Network support" OFF)
105-
105+
106106- if(network)
107107+ if(XERCESC_NETWORK)
108108 find_library(SOCKET_LIBRARY socket)
109109 find_library(NSL_LIBRARY nsl)
110-
110+
111111@@ -93,4 +93,4 @@ if(network)
112112 endif()
113113 else()
114114 set(netaccessor OFF)
115115- endif(network)
116116+ endif(XERCESC_NETWORK)
117-
118117diff --git a/cmake/XercesWarnings.cmake b/cmake/XercesWarnings.cmake
119- index f91be0faf..7ce567c9d 100644
118+ index f91be0faf..dd1e5a79f 100644
120119--- a/cmake/XercesWarnings.cmake
121120+++ b/cmake/XercesWarnings.cmake
122121@@ -18,6 +18,7 @@
123122 # limitations under the License.
124-
123+
125124 # compiler warnings
126125+ option(warnings "Enable compiler warnings" OFF)
127-
126+
128127 # These are annoyingly verbose, produce false positives or don't work
129128 # nicely with all supported compiler versions, so are disabled unless
130129@@ -33,25 +34,28 @@ option(fatal-warnings "Compiler warnings are errors" OFF)
0 commit comments