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
15d584cf
Commit
15d584cf
authored
Jul 05, 2014
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for tinyxml on OSX.
parent
69b8710e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
cmake/ThirdPartyTinyxml.cmake
cmake/ThirdPartyTinyxml.cmake
+1
-2
No files found.
cmake/ThirdPartyTinyxml.cmake
View file @
15d584cf
...
@@ -24,12 +24,11 @@ IF (THIRDPARTY_BUILD_TINYXML)
...
@@ -24,12 +24,11 @@ IF (THIRDPARTY_BUILD_TINYXML)
${
TPSRC
}
/src/tinyxml-2.4.3/tinyxml.h
${
TPSRC
}
/src/tinyxml-2.4.3/tinyxml.h
${
TPSRC
}
/dist/include/tinyxml.h
${
TPSRC
}
/dist/include/tinyxml.h
)
)
SET
(
TINYXML_LIB
${
TPSRC
}
/dist/lib/lib
tinyxml
.so
CACHE FILEPATH
SET
(
TINYXML_LIB tinyxml CACHE FILEPATH
"Tinyxml library"
FORCE
)
"Tinyxml library"
FORCE
)
MARK_AS_ADVANCED
(
TINYXML_LIB
)
MARK_AS_ADVANCED
(
TINYXML_LIB
)
LINK_DIRECTORIES
(
${
TPSRC
}
/dist/lib
)
LINK_DIRECTORIES
(
${
TPSRC
}
/dist/lib
)
INCLUDE_DIRECTORIES
(
${
TPSRC
}
/dist/include
)
INCLUDE_DIRECTORIES
(
${
TPSRC
}
/dist/include
)
MESSAGE
(
STATUS
"Build TinyXML:
${
TPSRC
}
/dist/lib/lib
${
TINYXML_LIB
}
.so"
)
ELSE
(
THIRDPARTY_BUILD_TINYXML
)
ELSE
(
THIRDPARTY_BUILD_TINYXML
)
INCLUDE
(
FindTinyXml
)
INCLUDE
(
FindTinyXml
)
ENDIF
(
THIRDPARTY_BUILD_TINYXML
)
ENDIF
(
THIRDPARTY_BUILD_TINYXML
)
...
...
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