Switched tinyxml from SHARED to STATIC.

7cb53fdb · Chris Cantwell · 15d584cf · 7cb53fdb · 7cb53fdb
Commit 7cb53fdb authored Jul 05, 2014 by Chris Cantwell
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

cmake/ThirdPartyTinyxml.cmake cmake/ThirdPartyTinyxml.cmake +2 -2

library/LibUtilities/CMakeLists.txt library/LibUtilities/CMakeLists.txt +1 -1

No files found.
--- 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}

--- 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()