From d432a93553f681b3c09429d04406b0f4b9bc281b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sun, 2 Jul 2017 17:53:05 -1000 Subject: [PATCH] tinyxml2 integration fixes --- CMakeLists.txt | 2 ++ assetnameparser/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01fea35fd..6d1e4e61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ project(urde) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(BUILD_SHARED_LIBS OFF) +set(BUILD_STATIC_LIBS ON) if(MSVC) if(${CMAKE_GENERATOR} MATCHES "Visual Studio*") diff --git a/assetnameparser/CMakeLists.txt b/assetnameparser/CMakeLists.txt index 10ab0e31c..a9fdba958 100644 --- a/assetnameparser/CMakeLists.txt +++ b/assetnameparser/CMakeLists.txt @@ -12,4 +12,4 @@ if (UNIX) endif() -target_link_libraries(assetnameparser tinyxml2 logvisor ${AN_PARSER_LIBS}) +target_link_libraries(assetnameparser tinyxml2_static logvisor ${AN_PARSER_LIBS})