From 7cb53fdb61fc95c60ba53f895173b5f38a3eb3c4 Mon Sep 17 00:00:00 2001 From: Chris Cantwell Date: Sat, 5 Jul 2014 23:22:28 +0100 Subject: [PATCH] Switched tinyxml from SHARED to STATIC. --- cmake/ThirdPartyTinyxml.cmake | 4 ++-- library/LibUtilities/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/ThirdPartyTinyxml.cmake b/cmake/ThirdPartyTinyxml.cmake index 3a9a470d2..ab4da12dd 100644 --- a/cmake/ThirdPartyTinyxml.cmake +++ b/cmake/ThirdPartyTinyxml.cmake @@ -10,8 +10,8 @@ IF (THIRDPARTY_BUILD_TINYXML) EXTERNALPROJECT_ADD( tinyxml-2.4.3 PREFIX ${TPSRC} - URL ${TPSRC}/tinyxml_2_4_3.tar.bz2 - URL_MD5 "aec842139928e65aa7abdff6de0a09ec" + URL ${TPURL}/tinyxml_2_4_3-1.tar.bz2 + URL_MD5 "76e7fa1264520ec0bbc36a0d5117806d" DOWNLOAD_DIR ${TPSRC} CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER} diff --git a/library/LibUtilities/CMakeLists.txt b/library/LibUtilities/CMakeLists.txt index 279929e4b..3427e99b4 100644 --- a/library/LibUtilities/CMakeLists.txt +++ b/library/LibUtilities/CMakeLists.txt @@ -384,7 +384,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ) # TinyXML -TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${TINYXML_LIB}) +TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${TINYXML_LIB}) IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" ) TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC rt) ENDIF() -- GitLab