Skip to content

Commit

Permalink
Merge pull request #3 from leggedrobotics/fix/pugixml-1-10
Browse files Browse the repository at this point in the history
Pugixml position independent code
  • Loading branch information
tomlankhorst authored Oct 5, 2020
2 parents 22e49f1 + ca05bc7 commit fe47104
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions CMake/Dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,16 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH})

message(STATUS "Building pugixml")
file(DOWNLOAD
https://github.com/zeux/pugixml/releases/download/v1.9/pugixml-1.9.tar.gz
${PROJECT_BINARY_DIR}/pugixml-1.9.tar.gz)
https://github.com/zeux/pugixml/releases/download/v1.10/pugixml-1.10.tar.gz
${PROJECT_BINARY_DIR}/pugixml-1.10.tar.gz)
execute_process(COMMAND ${CMAKE_COMMAND}
-E tar xf pugixml-1.9.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
-E tar xf pugixml-1.10.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
execute_process(COMMAND ${BUILD_COMMAND_COMMON}
${PROJECT_BINARY_DIR}/pugixml-1.9
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/pugixml-1.9)
-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE # this will be linked into a shared lib
${PROJECT_BINARY_DIR}/pugixml-1.10
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/pugixml-1.10)
execute_process(COMMAND ${CMAKE_COMMAND}
--build ${PROJECT_BINARY_DIR}/pugixml-1.9 ${BUILD_COMMAND_OPTS})
--build ${PROJECT_BINARY_DIR}/pugixml-1.10 ${BUILD_COMMAND_OPTS})

find_package(Freetype)
if (NOT FREETYPE_FOUND)
Expand Down

0 comments on commit fe47104

Please sign in to comment.