diff options
| author | Brad King <brad.king@kitware.com> | 2008-06-05 14:01:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-06-05 14:01:16 (GMT) |
| commit | 3ecfb5f7e8e57d4c273d25eeaaecffea2cf51d09 (patch) | |
| tree | ad6d26ed6e250355e58b63cdd3d92aa81534fa36 | |
| parent | a9a33a5c5e1b2d396e6844bcdb99f7a72e26b61e (diff) | |
| download | CMake-3ecfb5f7e8e57d4c273d25eeaaecffea2cf51d09.zip CMake-3ecfb5f7e8e57d4c273d25eeaaecffea2cf51d09.tar.gz CMake-3ecfb5f7e8e57d4c273d25eeaaecffea2cf51d09.tar.bz2 | |
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.
| -rw-r--r-- | Tests/CustomCommand/wrapper.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Tests/CustomCommand/wrapper.cxx b/Tests/CustomCommand/wrapper.cxx index 97912de..93cb079 100644 --- a/Tests/CustomCommand/wrapper.cxx +++ b/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; } |