From 8d8d76707e5f7721b752a281314f3cc61d143c70 Mon Sep 17 00:00:00 2001 From: Ruben Smits Date: Mon, 16 May 2011 15:28:29 +0200 Subject: [PATCH] cmake: force orocos_target if not empty Signed-off-by: Ruben Smits --- orocos-rtt-config.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/orocos-rtt-config.cmake b/orocos-rtt-config.cmake index 5a8d9d8e4..84e974b96 100644 --- a/orocos-rtt-config.cmake +++ b/orocos-rtt-config.cmake @@ -65,12 +65,12 @@ ######################################################################################################################## # Set the default target operating system, if unspecified -if(NOT DEFINED OROCOS_TARGET) - set(DOC_STRING "The Operating System target. One of [gnulinux lxrt macosx win32 xenomai]") - if(NOT $ENV{OROCOS_TARGET} STREQUAL "") - set(OROCOS_TARGET $ENV{OROCOS_TARGET} CACHE STRING "${DOC_STRING}") - message( "Detected OROCOS_TARGET environment variable. Using: ${OROCOS_TARGET}") - else() +set(DOC_STRING "The Operating System target. One of [gnulinux lxrt macosx win32 xenomai]") +if(NOT $ENV{OROCOS_TARGET} STREQUAL "") + set(OROCOS_TARGET $ENV{OROCOS_TARGET} CACHE STRING "${DOC_STRING}" FORCE) + message( "Detected OROCOS_TARGET environment variable. Using: ${OROCOS_TARGET}") +else() + if(NOT DEFINED OROCOS_TARGET) if(MSVC) set(OROCOS_TARGET win32 CACHE STRING "${DOC_STRING}") elseif(APPLE AND ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")