From 9901e3848f3a27e7470fdb5ea6b739fcfc6d72cd Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 17 Feb 2011 15:16:00 +0100 Subject: [PATCH] cmake: handle multiple paths in RTT_COMPONENT_PATH correctly and reset cmake variables before searching for libraries --- orocos-rtt-config.cmake | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/orocos-rtt-config.cmake b/orocos-rtt-config.cmake index f047a91..4277b65 100644 --- a/orocos-rtt-config.cmake +++ b/orocos-rtt-config.cmake @@ -165,12 +165,13 @@ list(APPEND OROCOS-RTT_PLUGIN_PATH "${OROCOS-RTT_PLUGINS_PATH}" "${OROCOS-RTT_TYPES_PATH}") # Append additional user-defined plugin search paths -foreach(CUSTOM_PLUGIN_PATH $ENV{RTT_COMPONENT_PATH}) +file(TO_CMAKE_PATH "$ENV{RTT_COMPONENT_PATH}" ENV_RTT_COMPONENT_PATH) +foreach(CUSTOM_COMPONENT_PATH ${ENV_RTT_COMPONENT_PATH}) list(APPEND OROCOS-RTT_PLUGIN_PATH "${CUSTOM_COMPONENT_PATH}/plugins" "${CUSTOM_COMPONENT_PATH}/types") endforeach() # Append additional user-defined component search paths -foreach(CUSTOM_COMPONENT_PATH $ENV{RTT_COMPONENT_PATH}) +foreach(CUSTOM_COMPONENT_PATH ${ENV_RTT_COMPONENT_PATH}) list(APPEND OROCOS-RTT_COMPONENT_PATH "${CUSTOM_COMPONENT_PATH}") endforeach() @@ -179,6 +180,9 @@ foreach(COMPONENT ${OROCOS-RTT_FIND_COMPONENTS} ${Orocos-RTT_FIND_COMPONENTS}) # Find individual plugin string(TOUPPER ${COMPONENT} COMPONENT_UPPER) + set(OROCOS-RTT_${COMPONENT_UPPER}_FOUND FALSE) + unset(OROCOS-RTT_${COMPONENT_UPPER}_LIBRARY CACHE) + find_library(OROCOS-RTT_${COMPONENT_UPPER}_LIBRARY NAMES ${COMPONENT} ${COMPONENT}-${OROCOS_TARGET} PATHS ${OROCOS-RTT_PLUGIN_PATH} NO_DEFAULT_PATH) mark_as_advanced(OROCOS-RTT_${COMPONENT_UPPER}_LIBRARY) -- 1.7.1