Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Nektar
Nektar
Commits
7cb53fdb
Commit
7cb53fdb
authored
Jul 05, 2014
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switched tinyxml from SHARED to STATIC.
parent
15d584cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
cmake/ThirdPartyTinyxml.cmake
cmake/ThirdPartyTinyxml.cmake
+2
-2
library/LibUtilities/CMakeLists.txt
library/LibUtilities/CMakeLists.txt
+1
-1
No files found.
cmake/ThirdPartyTinyxml.cmake
View file @
7cb53fdb
...
...
@@ -10,8 +10,8 @@ IF (THIRDPARTY_BUILD_TINYXML)
EXTERNALPROJECT_ADD
(
tinyxml-2.4.3
PREFIX
${
TPSRC
}
URL
${
TP
SRC
}
/tinyxml_2_4_3.tar.bz2
URL_MD5
"
aec842139928e65aa7abdff6de0a09ec
"
URL
${
TP
URL
}
/tinyxml_2_4_3
-1
.tar.bz2
URL_MD5
"
76e7fa1264520ec0bbc36a0d5117806d
"
DOWNLOAD_DIR
${
TPSRC
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_C_COMPILER:FILEPATH=
${
CMAKE_C_COMPILER
}
...
...
library/LibUtilities/CMakeLists.txt
View file @
7cb53fdb
...
...
@@ -384,7 +384,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC
)
# TinyXML
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_P
UBLIC
${
TINYXML_LIB
}
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_P
RIVATE
${
TINYXML_LIB
}
)
IF
(
${
CMAKE_SYSTEM
}
MATCHES
"Linux.*"
)
TARGET_LINK_LIBRARIES
(
LibUtilities LINK_PUBLIC rt
)
ENDIF
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment