diff --git a/CMakeLists.txt b/CMakeLists.txt index 1facd6a5..6a2b2612 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +28,12 @@ find_package(SDL2_mixer REQUIRED) include_directories(${SDL2_INCLUDE_DIR} ${SDL2_MIXER_INCLUDE_DIRS}) list(APPEND PORTAL_LIBRARIES ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARIES} ) +find_package(TinyXML REQUIRED) +include_directories(${TINYXML_INCLUDE_DIR}) +list(APPEND PORTAL_LIBRARIES ${TINYXML_LIBRARIES} ) + + + set(PORTAL_TEST_LIBRARIES ${PORTAL_LIBRARIES}) add_subdirectory(data) diff --git a/cmake/FindTinyXML.cmake b/cmake/FindTinyXML.cmake new file mode 100644 index 00000000..6bac4dec --- /dev/null +++ b/cmake/FindTinyXML.cmake @@ -0,0 +1,28 @@ +# - Find TinyXML +# Find the native TinyXML includes and library +# +# TINYXML_FOUND - True if TinyXML found. +# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc. +# TINYXML_LIBRARIES - List of libraries when using TinyXML. +# + +IF( TINYXML_INCLUDE_DIR ) + # Already in cache, be silent + SET( TinyXML_FIND_QUIETLY TRUE ) +ENDIF( TINYXML_INCLUDE_DIR ) + +FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h" + PATH_SUFFIXES "tinyxml" ) +set (TINYXML_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR}) + +FIND_LIBRARY( TINYXML_LIBRARY + NAMES "tinyxml" + PATH_SUFFIXES "tinyxml" ) +set (TINYXML_LIBRARIES ${TINYXML_LIBRARY}) + +# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if +# all listed variables are TRUE +INCLUDE( "FindPackageHandleStandardArgs" ) +FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_LIBRARY TINYXML_INCLUDE_DIR ) + +MARK_AS_ADVANCED( TINYXML_LIBRARY TINYXML_INCLUDE_DIR TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES ) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 7875fa52..78347aab 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -31,7 +31,7 @@ add_executable(${EXE_NAME} engine/env/Config.cpp engine/env/Path.cpp ) -target_link_libraries(${EXE_NAME} ${PORTAL_LIBRARIES} tinyxml) +target_link_libraries(${EXE_NAME} ${PORTAL_LIBRARIES}) install(TARGETS ${EXE_NAME} DESTINATION bin) add_custom_target(run COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}${CMAKE_EXECUTABLE_SUFFIX} -datadir ${CMAKE_SOURCE_DIR}/data/ )