Commit 7cb53fdb authored by Chris Cantwell's avatar Chris Cantwell

Switched tinyxml from SHARED to STATIC.

parent 15d584cf
...@@ -10,8 +10,8 @@ IF (THIRDPARTY_BUILD_TINYXML) ...@@ -10,8 +10,8 @@ IF (THIRDPARTY_BUILD_TINYXML)
EXTERNALPROJECT_ADD( EXTERNALPROJECT_ADD(
tinyxml-2.4.3 tinyxml-2.4.3
PREFIX ${TPSRC} PREFIX ${TPSRC}
URL ${TPSRC}/tinyxml_2_4_3.tar.bz2 URL ${TPURL}/tinyxml_2_4_3-1.tar.bz2
URL_MD5 "aec842139928e65aa7abdff6de0a09ec" URL_MD5 "76e7fa1264520ec0bbc36a0d5117806d"
DOWNLOAD_DIR ${TPSRC} DOWNLOAD_DIR ${TPSRC}
CONFIGURE_COMMAND ${CMAKE_COMMAND} CONFIGURE_COMMAND ${CMAKE_COMMAND}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER} -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
......
...@@ -384,7 +384,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ...@@ -384,7 +384,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC
) )
# TinyXML # TinyXML
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${TINYXML_LIB}) TARGET_LINK_LIBRARIES(LibUtilities LINK_PRIVATE ${TINYXML_LIB})
IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" ) IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC rt) TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC rt)
ENDIF() ENDIF()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment