tinyxml2.patch 1.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. --- a/CMakeLists.txt
  3. +++ b/CMakeLists.txt
  4. @@ -62,7 +62,11 @@ endif(BUILD_PACKAGES)
  5. find_package(Boost 1.56.0 REQUIRED)
  6. include_directories(${Boost_INCLUDE_DIR})
  7. -include_directories(${CMAKE_CURRENT_SOURCE_DIR}/tinyxml2)
  8. +
  9. +find_package(tinyxml2 REQUIRED)
  10. +include_directories("${tinyxml2_DIR}/../../../include/")
  11. +link_directories("${tinyxml2_DIR}/../../")
  12. +
  13. include_directories ("${PROJECT_SOURCE_DIR}/src")
  14. add_definitions(-DSIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P})
  15. diff --git a/src/mfast/xml_parser/CMakeLists.txt b/src/mfast/xml_parser/CMakeLists.txt
  16. --- a/src/mfast/xml_parser/CMakeLists.txt
  17. +++ b/src/mfast/xml_parser/CMakeLists.txt
  18. @@ -6,12 +6,10 @@ file (GLOB_RECURSE sources "*.cpp") ## retrieve all source files in current
  19. set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
  20. -include_directories("${CMAKE_SOURCE_DIR}/tinyxml2")
  21. -
  22. -set(mfast_xml_parser_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../../../tinyxml2/tinyxml2.cpp ${sources} ${headers})
  23. +set(mfast_xml_parser_SRCS ${sources} ${headers})
  24. add_library(mfast_xml_parser_static STATIC ${mfast_xml_parser_SRCS})
  25. -target_link_libraries(mfast_xml_parser_static mfast_static)
  26. +target_link_libraries(mfast_xml_parser_static mfast_static tinyxml2)
  27. if (UNIX)
  28. set_target_properties(mfast_xml_parser_static PROPERTIES OUTPUT_NAME mfast_xml_parser)
  29. @@ -39,7 +37,7 @@ if (BUILD_SHARED_LIBS)
  30. set_target_properties(mfast_xml_parser PROPERTIES COMPILE_FLAGS -fvisibility=hidden)
  31. endif()
  32. - target_link_libraries(mfast_xml_parser mfast)
  33. + target_link_libraries(mfast_xml_parser mfast tinyxml2)
  34. set_target_properties(mfast_xml_parser PROPERTIES
  35. LINKER_LANGUAGE CXX
  36. VERSION "${MFAST_VERSION}"