[Cmake-commits] [cmake-commits] hoffman committed GetPrerequisites.cmake 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Sep 8 11:23:03 EDT 2008


Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv23008

Modified Files:
	GetPrerequisites.cmake 
Log Message:
ENH: do not add the same thing to the PATH again and again


Index: GetPrerequisites.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/GetPrerequisites.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** GetPrerequisites.cmake	6 Sep 2008 16:20:07 -0000	1.3
--- GetPrerequisites.cmake	8 Sep 2008 15:23:01 -0000	1.4
***************
*** 378,382 ****
  function(get_prerequisites target prerequisites_var exclude_system recurse exepath dirs)
    set(verbose 0)
- 
    set(eol_char "E")
  
--- 378,381 ----
***************
*** 462,466 ****
      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}")
      endif(EXISTS "${gp_cmd_dlls_dir}")
    endif("${gp_tool}" STREQUAL "dumpbin")
--- 461,468 ----
      get_filename_component(gp_cmd_dlls_dir "${gp_cmd_dir}/../../Common7/IDE" ABSOLUTE)
      if(EXISTS "${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")



More information about the Cmake-commits mailing list