Update cmake config for tinyxml2 9.0.0

This commit is contained in:
Philip Molter 2022-11-04 11:09:11 -05:00
parent b9d2a5302a
commit 6c41138b02

View File

@ -229,16 +229,11 @@ endif()
if (USE_INTERNAL_TINYXML) if (USE_INTERNAL_TINYXML)
message("-- Using vendored TinyXML2") message("-- Using vendored TinyXML2")
set(TINYXML_DIR vendor/github.com/leethomason/tinyxml2) set(TINYXML_DIR vendor/github.com/leethomason/tinyxml2)
set(TINYXML_LIBRARIES tinyxml2)
if (BUILD_SHARED_LIBS) if (BUILD_SHARED_LIBS)
set(BUILD_STATIC_LIBS OFF CACHE BOOL "build static libs")
set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libs") set(BUILD_SHARED_LIBS ON CACHE BOOL "build shared libs")
set(TINYXML_LIBRARIES tinyxml2)
else ()
set(BUILD_STATIC_LIBS ON CACHE BOOL "build static libs")
set(BUILD_SHARED_LIBS OFF CACHE BOOL "build shared libs")
set(TINYXML_LIBRARIES tinyxml2_static)
endif () endif ()
set(BUILD_TESTS OFF CACHE BOOL "build tests") set(BUILD_TESTING OFF CACHE BOOL "build tests")
add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL) add_subdirectory(${TINYXML_DIR} EXCLUDE_FROM_ALL)
include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR}) include_directories(${CMAKE_CURRENT_LIST_DIR}/${TINYXML_DIR})
link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR}) link_directories(${CMAKE_BINARY_DIR}/${TINYXML_DIR})