[Cmake-commits] [cmake-commits] king committed AddExternalProject.cmake 1.20 1.21

[cmake-commits at cmake.org]

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

Modified Files:
	AddExternalProject.cmake 
Log Message:
BUG: Fix AddExternalProject config command id

This fixes the get_configure_command_id function to not mistake
CONFIGURE_COMMAND values that run "cmake -P" or "cmake -E" for a CMake
project configuration.  These values just help run scripts.


Index: AddExternalProject.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/AddExternalProject.cmake,v
retrieving revision 1.20
retrieving revision 1.21
diff -C 2 -d -r1.20 -r1.21
*** AddExternalProject.cmake	30 Mar 2009 15:38:43 -0000	1.20
--- AddExternalProject.cmake	31 Mar 2009 14:13:01 -0000	1.21
***************
*** 87,102 ****
      else()
        # Otherwise we have to analyze the value:
!       if(cmd MATCHES "/configure$")
          set(${cfg_cmd_id_var} "configure" PARENT_SCOPE)
        else()
!         if(cmd MATCHES "cmake")
!           set(${cfg_cmd_id_var} "cmake" PARENT_SCOPE)
!         else()
!           if(cmd MATCHES "config")
!             set(${cfg_cmd_id_var} "configure" PARENT_SCOPE)
!           else()
!             set(${cfg_cmd_id_var} "unknown:${cmd}" PARENT_SCOPE)
!           endif()
!         endif()
        endif()
      endif()
--- 87,98 ----
      else()
        # Otherwise we have to analyze the value:
!       if(cmd MATCHES "^[^;]*/configure")
!         set(${cfg_cmd_id_var} "configure" PARENT_SCOPE)
!       elseif(cmd MATCHES "^[^;]*/cmake" AND NOT cmd MATCHES ";-[PE];")
!         set(${cfg_cmd_id_var} "cmake" PARENT_SCOPE)
!       elseif(cmd MATCHES "config")
          set(${cfg_cmd_id_var} "configure" PARENT_SCOPE)
        else()
!         set(${cfg_cmd_id_var} "unknown:${cmd}" PARENT_SCOPE)
        endif()
      endif()