From 6ca1977e786daf49ea29519130228df2f2b16f26 Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Tue, 1 Dec 2015 10:42:08 +0100 Subject: [PATCH] Added Xerces dependency --- README.md | 1 + cmake/FindXerces.cmake | 23 +++++++++++++++++++++++ deps | 2 +- src/Engine/CMakeLists.txt | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 cmake/FindXerces.cmake diff --git a/README.md b/README.md index 59f61f1b..217cb69e 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Libraries bundled along with binaries for Windows (MSVC14), available as a submo | **[Assimp](http://assimp.sourceforge.net)** | 3.1.1 | [BSD 3-Clause License](http://assimp.sourceforge.net/main_license.html) | | **[zlib](http://www.zlib.net)** | 1.28 | [zlib License](http://www.zlib.net/zlib_license.html) | | **[libpng](http://www.libpng.org/pub/png/libpng.html)** | 1.6.19 | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) | +| **[Xerces-C++](https://xerces.apache.org/xerces-c)** | 3.1.2 | [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0) | #### External libraries Libraries that are too big to be bundled with the project. diff --git a/cmake/FindXerces.cmake b/cmake/FindXerces.cmake new file mode 100644 index 00000000..8ea0fb1d --- /dev/null +++ b/cmake/FindXerces.cmake @@ -0,0 +1,23 @@ +# XERCES_FOUND +# XERCES_INCLUDE_DIRS +# XERCES_LIBRARIES + +find_path(XERCES_INCLUDE_DIR xercesc/dom/dom.hpp + /usr/local/include + /usr/include +) + +find_library(XERCES_LIBRARY + NAMES + xerces-c_3 + xerces-c_3D + PATHS + /usr/local/lib + /usr/lib +) + +set(XERCES_INCLUDE_DIRS ${XERCES_INCLUDE_DIR}) +set(XERCES_LIBRARIES ${XERCES_LIBRARY}) + +find_package_handle_standard_args(Xerces DEFAULT_MSG XERCES_LIBRARY XERCES_INCLUDE_DIR) +mark_as_advanced(Xerces_FOUND XERCES_INCLUDE_DIR XERCES_LIBRARY) \ No newline at end of file diff --git a/deps b/deps index 65d3f3bc..1b478d31 160000 --- a/deps +++ b/deps @@ -1 +1 @@ -Subproject commit 65d3f3bc314357b8ec67a99f9f69a3fb73b813c1 +Subproject commit 1b478d3159f12273059a684ee8e187f4a25c89f0 diff --git a/src/Engine/CMakeLists.txt b/src/Engine/CMakeLists.txt index 7bc15041..396a34b4 100644 --- a/src/Engine/CMakeLists.txt +++ b/src/Engine/CMakeLists.txt @@ -7,6 +7,7 @@ find_package(Boost REQUIRED COMPONENTS system filesystem thread chrono) find_package(assimp REQUIRED) find_package(ZLIB REQUIRED) find_package(PNG REQUIRED) +find_package(Xerces REQUIRED) # Because FindOpenAL is retarded #set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "${CMAKE_SOURCE_DIR}/deps/include/AL") #find_package(OpenAL REQUIRED) @@ -23,6 +24,7 @@ include_directories( ${Boost_INCLUDE_DIRS} ${assimp_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} + ${Xerces_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR} ${X11_INCLUDE_DIRS} ) @@ -76,6 +78,7 @@ set(LIBRARIES ${Boost_LIBRARIES} ${assimp_LIBRARIES} ${PNG_LIBRARIES} + ${Xerces_LIBRARIES} ${OPENAL_LIBRARY} ${X11_LIBRARIES} )