deal with CMake double expansion

This commit is contained in:
Dirk Thomas 2014-09-13 10:20:50 -07:00
parent ea889664ea
commit 573abaa2b6

View file

@ -10,14 +10,14 @@
function(get_default_ros_middleware_implementation var) function(get_default_ros_middleware_implementation var)
get_available_ros_middleware_implementations(middleware_implementations) get_available_ros_middleware_implementations(middleware_implementations)
if("${middleware_implementations}" STREQUAL "") if("${middleware_implementations} " STREQUAL " ")
message(FATAL_ERROR "Could not find any ROS middleware implementation.") message(FATAL_ERROR "Could not find any ROS middleware implementation.")
endif() endif()
# option() # option()
if(NOT "${ROS_MIDDLEWARE_IMPLEMENTATION}" STREQUAL "") if(NOT "${ROS_MIDDLEWARE_IMPLEMENTATION} " STREQUAL " ")
set(middleware_implementation "${ROS_MIDDLEWARE_IMPLEMENTATION}") set(middleware_implementation "${ROS_MIDDLEWARE_IMPLEMENTATION}")
elseif(NOT "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION}" STREQUAL "") elseif(NOT "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION} " STREQUAL " ")
set(middleware_implementation "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION}") set(middleware_implementation "$ENV{ROS_MIDDLEWARE_IMPLEMENTATION}")
else() else()
# TODO detemine "default" implementation based on the available ones # TODO detemine "default" implementation based on the available ones