summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-05-04 17:49:25 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-05-04 17:49:25 (GMT)
commit2e966f6c7a965bc30b4e25201119b21aa851d56f (patch)
treed83ffeb10e71f2685deb24c36a8d6230d1940d1b
parent7cde00687cefa63e1623e0891e0d10517bd87b17 (diff)
downloadlibkolabxml-2e966f6c7a965bc30b4e25201119b21aa851d56f.tar.gz
Find xerces-c and xsdcxx which have been installed in non-standard locations.
-rw-r--r--CMakeLists.txt2
-rw-r--r--cmake/modules/FindLibkolabxmlDependencies.cmake10
2 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03980e6..e29215a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,6 +174,8 @@ include_directories(
compiled
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
+ ${XSDCXX_INCLUDE_DIRS}
+ ${XERCES_C_INCLUDE_DIRS}
)
diff --git a/cmake/modules/FindLibkolabxmlDependencies.cmake b/cmake/modules/FindLibkolabxmlDependencies.cmake
index 5c16f6a..84c2de6 100644
--- a/cmake/modules/FindLibkolabxmlDependencies.cmake
+++ b/cmake/modules/FindLibkolabxmlDependencies.cmake
@@ -17,12 +17,18 @@ else()
endif()
find_program(XSDCXX xsdcxx /usr/bin/)
+if (XSDCXX)
+ find_path(XSDCXX_INCLUDE_DIRS NAMES xsd/cxx/version.hxx)
+endif()
find_package_handle_standard_args(XSDCXX DEFAULT_MSG
- XSDCXX)
+ XSDCXX XSDCXX_INCLUDE_DIRS)
find_library(XERCES_C NAMES xerces-c xerces-c_2)
+if (XERCES_C)
+ find_path(XERCES_C_INCLUDE_DIRS NAMES xercesc/framework/XMLGrammarPool.hpp)
+endif()
find_package_handle_standard_args(Xerces DEFAULT_MSG
- XERCES_C)
+ XERCES_C XERCES_C_INCLUDE_DIRS)
find_program(SWIG swig /usr/bin/)
if(SWIG)