From 6e2abf7aa292c49094958844e4a9c3d8d78ff22e Mon Sep 17 00:00:00 2001 From: The Coriolis Project Date: Wed, 28 Apr 2010 20:36:23 +0000 Subject: [PATCH] Correct project path settings. --- hurricane/cmake_modules/FindHURRICANE.cmake | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index dee484b6..9d6e9cb4 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -61,21 +61,17 @@ SET(HURRICANE_DIR_MESSAGE "Set the HURRICANE_INCLUDE_DIR cmake cach IF(UNIX) # Setup the DIR_SEARCH_PATH. MACRO(SETUP_SEARCH_DIR project) - IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) - MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}") - LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX) - IF( DIR_INDEX LESS 0) - LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_USER_TOP}") - ENDIF( DIR_INDEX LESS 0) - ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) - IF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}") - LIST(FIND ${project}_DIR_SEARCH "${${project}_DIR_SEARCH}" DIR_INDEX) - IF( DIR_INDEX LESS 0) - LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_TOP}") - ENDIF( DIR_INDEX LESS 0) + LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_TOP}") ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") ) + + IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) + MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}") + LIST(INSERT ${project}_DIR_SEARCH 0 "$ENV{${project}_USER_TOP}") + ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") ) + + LIST(REMOVE_DUPLICATES ${project}_DIR_SEARCH) ENDMACRO(SETUP_SEARCH_DIR project) SETUP_SEARCH_DIR(CORIOLIS)