浏览代码

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.

Brad King 17 年之前
父节点
当前提交
3ecfb5f7e8
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      Tests/CustomCommand/wrapper.cxx

+ 8 - 2
Tests/CustomCommand/wrapper.cxx

@@ -16,12 +16,18 @@ int main(int argc, char *argv[])
   fprintf(fp,"int wrapped_help() { return 5; }\n");
   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, CMAKE_INTDIR) != 0)
+  if(strcmp(cfg, CFG_DIR) != 0)
     {
     fprintf(stderr,
             "Did not receive expected configuration argument:\n"
-            "  expected [" CMAKE_INTDIR "]\n"
+            "  expected [" CFG_DIR "]\n"
             "  received [%s]\n", cfg);
     return 1;
     }