Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Nektar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dappur
Nektar
Commits
36eff004
Commit
36eff004
authored
10 years ago
by
Chris Cantwell
Browse files
Options
Downloads
Patches
Plain Diff
Incorporated header install step into tinyxml package.
parent
7cb53fdb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/ThirdPartyTinyxml.cmake
+1
-5
1 addition, 5 deletions
cmake/ThirdPartyTinyxml.cmake
tests/CMakeLists.txt
+0
-1
0 additions, 1 deletion
tests/CMakeLists.txt
with
1 addition
and
6 deletions
cmake/ThirdPartyTinyxml.cmake
+
1
−
5
View file @
36eff004
...
...
@@ -11,7 +11,7 @@ IF (THIRDPARTY_BUILD_TINYXML)
tinyxml-2.4.3
PREFIX
${
TPSRC
}
URL
${
TPURL
}
/tinyxml_2_4_3-1.tar.bz2
URL_MD5
"
76e7fa1264520ec0bbc36a0d5117806d
"
URL_MD5
"
a00f5e3b547b803977c5744547a688f7
"
DOWNLOAD_DIR
${
TPSRC
}
CONFIGURE_COMMAND
${
CMAKE_COMMAND
}
-DCMAKE_C_COMPILER:FILEPATH=
${
CMAKE_C_COMPILER
}
...
...
@@ -19,10 +19,6 @@ IF (THIRDPARTY_BUILD_TINYXML)
-DCMAKE_INSTALL_PREFIX:PATH=
${
TPSRC
}
/dist
-DCMAKE_CXX_FLAGS:STRING=-DTIXML_USE_STL
${
TPSRC
}
/src/tinyxml-2.4.3
INSTALL_COMMAND $
(
MAKE
)
install
COMMAND
${
CMAKE_COMMAND
}
-E copy
${
TPSRC
}
/src/tinyxml-2.4.3/tinyxml.h
${
TPSRC
}
/dist/include/tinyxml.h
)
SET
(
TINYXML_LIB tinyxml CACHE FILEPATH
"Tinyxml library"
FORCE
)
...
...
This diff is collapsed.
Click to expand it.
tests/CMakeLists.txt
+
0
−
1
View file @
36eff004
...
...
@@ -27,7 +27,6 @@ IF(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
ENDIF
()
ADD_EXECUTABLE
(
Tester
${
TESTER_SOURCES
}
${
ARGN
}
)
MESSAGE
(
STATUS
"Tinyxml:
${
TINYXML_LIB
}
"
)
TARGET_LINK_LIBRARIES
(
Tester
${
Boost_FILESYSTEM_LIBRARY
}
${
Boost_SYSTEM_LIBRARY
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment