[Cmake-commits] [cmake-commits] king committed wrapper.cxx 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CustomCommand
In directory public:/mounts/ram/cvs-serv3399/Tests/CustomCommand

Modified Files:
	wrapper.cxx 
Log Message:
BUG: Fix new custom command with make-var expansion test on VS6.  The VS6 IDE adds some extra characters to the variable value during expansion.


Index: wrapper.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CustomCommand/wrapper.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** wrapper.cxx	4 Jun 2008 16:10:59 -0000	1.6
--- wrapper.cxx	5 Jun 2008 14:01:16 -0000	1.7
***************
*** 17,26 ****
    fclose(fp);
  #ifdef CMAKE_INTDIR
    const char* cfg = (argc >= 4)? argv[3] : "";
!   if(strcmp(cfg, CMAKE_INTDIR) != 0)
      {
      fprintf(stderr,
              "Did not receive expected configuration argument:\n"
!             "  expected [" CMAKE_INTDIR "]\n"
              "  received [%s]\n", cfg);
      return 1;
--- 17,32 ----
    fclose(fp);
  #ifdef CMAKE_INTDIR
+   /* The VS6 IDE passes a leading ".\\" in its variable expansion.  */
+ # if defined(_MSC_VER) && _MSC_VER == 1200
+ #  define CFG_DIR ".\\" CMAKE_INTDIR
+ # else
+ #  define CFG_DIR CMAKE_INTDIR
+ # endif
    const char* cfg = (argc >= 4)? argv[3] : "";
!   if(strcmp(cfg, CFG_DIR) != 0)
      {
      fprintf(stderr,
              "Did not receive expected configuration argument:\n"
!             "  expected [" CFG_DIR "]\n"
              "  received [%s]\n", cfg);
      return 1;