Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
David Youssefi
otb
Commits
11964f9a
Commit
11964f9a
authored
13 years ago
by
Julien Malik
Browse files
Options
Downloads
Patches
Plain Diff
COMP: fix TIXML_USE_STL management. wrong macro used, seen with macport version
parent
746ccac0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/FindTinyXML.cmake
+7
-5
7 additions, 5 deletions
CMake/FindTinyXML.cmake
CMake/ImportTinyXML.cmake
+1
-0
1 addition, 0 deletions
CMake/ImportTinyXML.cmake
CMake/otbConfigure.h.in
+2
-2
2 additions, 2 deletions
CMake/otbConfigure.h.in
with
10 additions
and
7 deletions
CMake/FindTinyXML.cmake
+
7
−
5
View file @
11964f9a
# - Find TinyXML
# Find the native TinyXML includes and library
#
# TINYXML_FOUND - True if TinyXML found.
# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
# TINYXML_LIBRARIES - List of libraries when using TinyXML.
# TINYXML_FOUND - True if TinyXML found.
# TINYXML_INCLUDE_DIRS - where to find tinyxml.h, etc.
# TINYXML_LIBRARIES - List of libraries when using TinyXML.
# TIXML_USE_STL - ON or undefined whether STL support is found
# can be used directly in a #cmakedefine
#
IF
(
TINYXML_INCLUDE_DIR
)
...
...
@@ -31,7 +33,7 @@ IF(TINYXML_FOUND)
SET
(
TINYXML_LIBRARIES
${
TINYXML_LIBRARY
}
)
# Check if STL support is enabled with macro TIXML_USE_STL
TRY_COMPILE
(
TI
NY
XML_USE_STL
TRY_COMPILE
(
TIXML_USE_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
}
"
...
...
@@ -42,6 +44,6 @@ ELSE(TINYXML_FOUND)
SET
(
TINYXML_INCLUDE_DIRS
)
SET
(
TINYXML_LIBRARIES
)
SET
(
TI
NY
XML_USE_STL
)
SET
(
TIXML_USE_STL
)
ENDIF
(
TINYXML_FOUND
)
This diff is collapsed.
Click to expand it.
CMake/ImportTinyXML.cmake
+
1
−
0
View file @
11964f9a
...
...
@@ -8,3 +8,4 @@ ELSE(TINYXML_FOUND)
SET
(
TINYXML_LIBRARIES otbtinyXML
)
ENDIF
(
TINYXML_FOUND
)
MARK_AS_ADVANCED
(
OTB_USE_EXTERNAL_TINYXML
)
This diff is collapsed.
Click to expand it.
CMake/otbConfigure.h.in
+
2
−
2
View file @
11964f9a
...
...
@@ -69,8 +69,8 @@
#cmakedefine OTB_USE_SIFTFAST
/* TinyXML Has STL */
#ifndef TI
NY
XML_USE_STL
#cmakedefine TI
NY
XML_USE_STL
#ifndef TIXML_USE_STL
#cmakedefine TIXML_USE_STL
#endif
/* Use Visu/Gui configurations */
...
...
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