-
Notifications
You must be signed in to change notification settings - Fork 61
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* remove boost dependency * make catkin and rosconsole optional, replace urdf by urdfdom * cmake modules for TinyXML and TinyXML2 source: https://github.com/ros/cmake_modules * append to cmake module path * replace urdf by urdfdom * mention source of local cmake module files * define ROS_WARN and ROS_ERROR as standard error * remove define guards from header files * always build shared library * define ROS_DEBUG as standard output
- Loading branch information
1 parent
30c9563
commit 4454445
Showing
6 changed files
with
258 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
################################################################################################## | ||
# | ||
# CMake script for finding TinyXML. | ||
# | ||
# Input variables: | ||
# | ||
# - TinyXML_ROOT_DIR (optional): When specified, header files and libraries will be searched for in | ||
# ${TinyXML_ROOT_DIR}/include | ||
# ${TinyXML_ROOT_DIR}/libs | ||
# respectively, and the default CMake search order will be ignored. When unspecified, the default | ||
# CMake search order is used. | ||
# This variable can be specified either as a CMake or environment variable. If both are set, | ||
# preference is given to the CMake variable. | ||
# Use this variable for finding packages installed in a nonstandard location, or for enforcing | ||
# that one of multiple package installations is picked up. | ||
# | ||
# | ||
# Cache variables (not intended to be used in CMakeLists.txt files) | ||
# | ||
# - TinyXML_INCLUDE_DIR: Absolute path to package headers. | ||
# - TinyXML_LIBRARY: Absolute path to library. | ||
# | ||
# | ||
# Output variables: | ||
# | ||
# - TinyXML_FOUND: Boolean that indicates if the package was found | ||
# - TinyXML_INCLUDE_DIRS: Paths to the necessary header files | ||
# - TinyXML_LIBRARIES: Package libraries | ||
# | ||
# | ||
# Example usage: | ||
# | ||
# find_package(TinyXML) | ||
# if(NOT TinyXML_FOUND) | ||
# # Error handling | ||
# endif() | ||
# ... | ||
# include_directories(${TinyXML_INCLUDE_DIRS} ...) | ||
# ... | ||
# target_link_libraries(my_target ${TinyXML_LIBRARIES}) | ||
# | ||
################################################################################################## | ||
|
||
# Get package location hint from environment variable (if any) | ||
if(NOT TinyXML_ROOT_DIR AND DEFINED ENV{TinyXML_ROOT_DIR}) | ||
set(TinyXML_ROOT_DIR "$ENV{TinyXML_ROOT_DIR}" CACHE PATH | ||
"TinyXML base directory location (optional, used for nonstandard installation paths)") | ||
endif() | ||
|
||
# Search path for nonstandard package locations | ||
if(TinyXML_ROOT_DIR) | ||
set(TinyXML_INCLUDE_PATH PATHS "${TinyXML_ROOT_DIR}/include" NO_DEFAULT_PATH) | ||
set(TinyXML_LIBRARY_PATH PATHS "${TinyXML_ROOT_DIR}/lib" NO_DEFAULT_PATH) | ||
endif() | ||
|
||
# Find headers and libraries | ||
find_path(TinyXML_INCLUDE_DIR NAMES tinyxml.h PATH_SUFFIXES "tinyxml" ${TinyXML_INCLUDE_PATH}) | ||
find_library(TinyXML_LIBRARY NAMES tinyxml PATH_SUFFIXES "tinyxml" ${TinyXML_LIBRARY_PATH}) | ||
|
||
mark_as_advanced(TinyXML_INCLUDE_DIR | ||
TinyXML_LIBRARY) | ||
|
||
# Output variables generation | ||
include(FindPackageHandleStandardArgs) | ||
find_package_handle_standard_args(TinyXML DEFAULT_MSG TinyXML_LIBRARY | ||
TinyXML_INCLUDE_DIR) | ||
|
||
set(TinyXML_FOUND ${TINYXML_FOUND}) # Enforce case-correctness: Set appropriately cased variable... | ||
unset(TINYXML_FOUND) # ...and unset uppercase variable generated by find_package_handle_standard_args | ||
|
||
if(TinyXML_FOUND) | ||
set(TinyXML_INCLUDE_DIRS ${TinyXML_INCLUDE_DIR}) | ||
set(TinyXML_LIBRARIES ${TinyXML_LIBRARY}) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
################################################################################################## | ||
# | ||
# CMake script for finding TinyXML2. | ||
# | ||
# Input variables: | ||
# | ||
# - TinyXML2_ROOT_DIR (optional): When specified, header files and libraries will be searched for in | ||
# ${TinyXML2_ROOT_DIR}/include | ||
# ${TinyXML2_ROOT_DIR}/libs | ||
# respectively, and the default CMake search order will be ignored. When unspecified, the default | ||
# CMake search order is used. | ||
# This variable can be specified either as a CMake or environment variable. If both are set, | ||
# preference is given to the CMake variable. | ||
# Use this variable for finding packages installed in a nonstandard location, or for enforcing | ||
# that one of multiple package installations is picked up. | ||
# | ||
# | ||
# Cache variables (not intended to be used in CMakeLists.txt files) | ||
# | ||
# - TinyXML2_INCLUDE_DIR: Absolute path to package headers. | ||
# - TinyXML2_LIBRARY: Absolute path to library. | ||
# | ||
# | ||
# Output variables: | ||
# | ||
# - TinyXML2_FOUND: Boolean that indicates if the package was found | ||
# - TinyXML2_INCLUDE_DIRS: Paths to the necessary header files | ||
# - TinyXML2_LIBRARIES: Package libraries | ||
# | ||
# | ||
# Example usage: | ||
# | ||
# find_package(TinyXML2) | ||
# if(NOT TinyXML2_FOUND) | ||
# # Error handling | ||
# endif() | ||
# ... | ||
# include_directories(${TinyXML2_INCLUDE_DIRS} ...) | ||
# ... | ||
# target_link_libraries(my_target ${TinyXML2_LIBRARIES}) | ||
# | ||
################################################################################################## | ||
|
||
# Get package location hint from environment variable (if any) | ||
if(NOT TinyXML2_ROOT_DIR AND DEFINED ENV{TinyXML2_ROOT_DIR}) | ||
set(TinyXML2_ROOT_DIR "$ENV{TinyXML2_ROOT_DIR}" CACHE PATH | ||
"TinyXML2 base directory location (optional, used for nonstandard installation paths)") | ||
endif() | ||
|
||
# Search path for nonstandard package locations | ||
if(TinyXML2_ROOT_DIR) | ||
set(TinyXML2_INCLUDE_PATH PATHS "${TinyXML2_ROOT_DIR}/include" NO_DEFAULT_PATH) | ||
set(TinyXML2_LIBRARY_PATH PATHS "${TinyXML2_ROOT_DIR}/lib" NO_DEFAULT_PATH) | ||
endif() | ||
|
||
# Find headers and libraries | ||
find_path(TinyXML2_INCLUDE_DIR NAMES tinyxml2.h PATH_SUFFIXES "tinyxml2" ${TinyXML2_INCLUDE_PATH}) | ||
find_library(TinyXML2_LIBRARY NAMES tinyxml2 PATH_SUFFIXES "tinyxml2" ${TinyXML2_LIBRARY_PATH}) | ||
|
||
mark_as_advanced(TinyXML2_INCLUDE_DIR | ||
TinyXML2_LIBRARY) | ||
|
||
# Output variables generation | ||
include(FindPackageHandleStandardArgs) | ||
find_package_handle_standard_args(TinyXML2 DEFAULT_MSG TinyXML2_LIBRARY | ||
TinyXML2_INCLUDE_DIR) | ||
|
||
set(TinyXML2_FOUND ${TINYXML2_FOUND}) # Enforce case-correctness: Set appropriately cased variable... | ||
unset(TINYXML2_FOUND) # ...and unset uppercase variable generated by find_package_handle_standard_args | ||
|
||
if(TinyXML2_FOUND) | ||
set(TinyXML2_INCLUDE_DIRS ${TinyXML2_INCLUDE_DIR}) | ||
set(TinyXML2_LIBRARIES ${TinyXML2_LIBRARY}) | ||
endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.