Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
8700c3a5
Commit
8700c3a5
authored
Nov 19, 2019
by
Victor Poughon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tixml-cmakedefine2' into 'develop'
BUG: better check for TIXML_USE_STL See merge request
!637
parents
25e76aad
9f0fcd95
Pipeline
#3069
passed with stages
in 6 minutes and 39 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
Modules/ThirdParty/TinyXML/CMakeLists.txt
Modules/ThirdParty/TinyXML/CMakeLists.txt
+5
-1
Modules/ThirdParty/TinyXML/src/otb_tinyxml.h.in
Modules/ThirdParty/TinyXML/src/otb_tinyxml.h.in
+1
-3
No files found.
Modules/ThirdParty/TinyXML/CMakeLists.txt
View file @
8700c3a5
...
...
@@ -21,13 +21,17 @@
project
(
OTBTinyXML
)
# Check if we need to define TIXML_USE_STL
try_compile
(
TIXML_
USE
_STL
try_compile
(
TIXML_
TEST
_STL
${
CMAKE_CURRENT_BINARY_DIR
}
/CMake
${
CMAKE_CURRENT_SOURCE_DIR
}
/CMake/otbTestTinyXMLUseSTL.cxx
CMAKE_FLAGS
"-DINCLUDE_DIRECTORIES:PATH=
${
TINYXML_INCLUDE_DIRS
}
"
"-DLINK_LIBRARIES:STRING=
${
TINYXML_LIBRARIES
}
"
COMPILE_DEFINITIONS
"-DTIXML_USE_STL"
OUTPUT_VARIABLE OUTPUT
)
if
(
NOT TIXML_TEST_STL
)
message
(
FATAL_ERROR
"TIXML must be compiled with TIXML_USE_STL=ON."
)
endif
()
configure_file
(
src/otb_tinyxml.h.in src/otb_tinyxml.h
)
set
(
OTBTinyXML_SYSTEM_INCLUDE_DIRS
...
...
Modules/ThirdParty/TinyXML/src/otb_tinyxml.h.in
View file @
8700c3a5
...
...
@@ -21,9 +21,7 @@
#ifndef otb_tinyxml_h
#define otb_tinyxml_h
#ifndef TIXML_USE_STL
#cmakedefine TIXML_USE_STL
#endif
#define TIXML_USE_STL
#include "tinyxml.h"
...
...
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