From 43837fb3e115c621af89c7d7d9d1df884e9c50d4 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 8 Sep 2008 11:23:01 -0400 Subject: [PATCH] ENH: do not add the same thing to the PATH again and again --- Modules/GetPrerequisites.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake index 86aac1d5c8..68b17bcd45 100644 --- a/Modules/GetPrerequisites.cmake +++ b/Modules/GetPrerequisites.cmake @@ -377,7 +377,6 @@ endfunction(gp_resolve_item) # function(get_prerequisites target prerequisites_var exclude_system recurse exepath dirs) set(verbose 0) - set(eol_char "E") if(NOT IS_ABSOLUTE "${target}") @@ -461,7 +460,10 @@ function(get_prerequisites target prerequisites_var exclude_system recurse exepa get_filename_component(gp_cmd_dir "${gp_cmd}" PATH) get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE) if(EXISTS "${gp_cmd_dlls_dir}") - set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}") + # only add to the path if it is not already in the path + if(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}") + set(ENV{PATH} "$ENV{PATH};${gp_cmd_dlls_dir}") + endif(NOT "$ENV{PATH}" MATCHES "${gp_cmd_dlls_dir}") endif(EXISTS "${gp_cmd_dlls_dir}") endif("${gp_tool}" STREQUAL "dumpbin") #