From 573abaa2b6ecc7e8419a7d12594e3090a65e8378 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Sat, 13 Sep 2014 10:20:50 -0700 Subject: [PATCH] deal with CMake double expansion --- .../cmake/get_default_ros_middleware_implementation.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ros_middleware_implementation/cmake/get_default_ros_middleware_implementation.cmake b/ros_middleware_implementation/cmake/get_default_ros_middleware_implementation.cmake index d2b09bb..772c7e0 100644 --- a/ros_middleware_implementation/cmake/get_default_ros_middleware_implementation.cmake +++ b/ros_middleware_implementation/cmake/get_default_ros_middleware_implementation.cmake @@ -10,14 +10,14 @@ function(get_default_ros_middleware_implementation var) 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.") endif() # option() - if(NOT "${ROS_MIDDLEWARE_IMPLEMENTATION}" STREQUAL "") + if(NOT "${ROS_MIDDLEWARE_IMPLEMENTATION} " STREQUAL " ") 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}") else() # TODO detemine "default" implementation based on the available ones