diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-28 16:17:18 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-10-28 16:17:18 (GMT) |
| commit | b4ae8bad4b8e7810a44e2f77363de3009260a473 (patch) | |
| tree | 7dd8a97d409c6339948ac4b3e0eda77cd9b7384e /Utilities | |
| parent | ebd0c2d3771835a1317c1fd70eafd3ebf2135b01 (diff) | |
| download | CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.zip CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.gz CMake-b4ae8bad4b8e7810a44e2f77363de3009260a473.tar.bz2 | |
RC 4 merge
Diffstat (limited to 'Utilities')
| -rw-r--r-- | Utilities/Release/dash2win64_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/cmtar/compat/fnmatch.c | 7 | ||||
| -rw-r--r-- | Utilities/cmtar/compat/snprintf.c | 4 | ||||
| -rw-r--r-- | Utilities/cmtar/libtar.c | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake index 2869ab4..19fec14 100644 --- a/Utilities/Release/dash2win64_release.cmake +++ b/Utilities/Release/dash2win64_release.cmake @@ -11,7 +11,7 @@ set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_GENERATOR:INTERNAL=Unix Makefiles BUILD_QtDialog:BOOL:=TRUE -QT_QMAKE_EXECUTABLE:FILEPATH=C:/cygwin/home/dashboard/qt/qt-all-opensource-src-4.5.2/bin/qmake.exe +QT_QMAKE_EXECUTABLE:FILEPATH=c:/Dashboards/Support/qt-4.5.3-static/bin/qmake.exe ") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake) diff --git a/Utilities/cmtar/compat/fnmatch.c b/Utilities/cmtar/compat/fnmatch.c index 936f21e..bb575b3 100644 --- a/Utilities/cmtar/compat/fnmatch.c +++ b/Utilities/cmtar/compat/fnmatch.c @@ -174,12 +174,7 @@ fnmatch(pattern, string, flags) /* NOTREACHED */ } -static int -rangematch(pattern, test, flags, newp) - const char *pattern; - char test; - int flags; - char **newp; +static int rangematch(const char *pattern, char test, int flags, char **newp) { int negate, ok; char c, c2; diff --git a/Utilities/cmtar/compat/snprintf.c b/Utilities/cmtar/compat/snprintf.c index ef6e2f1..599ccfe 100644 --- a/Utilities/cmtar/compat/snprintf.c +++ b/Utilities/cmtar/compat/snprintf.c @@ -42,6 +42,10 @@ #include <libtar/config.h> +#if defined(__INTEL_COMPILER) +# pragma warning disable 177 /* function declared but not referenced */ +#endif + #if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) #include <stdio.h> diff --git a/Utilities/cmtar/libtar.c b/Utilities/cmtar/libtar.c index 0d031b7..25f570f 100644 --- a/Utilities/cmtar/libtar.c +++ b/Utilities/cmtar/libtar.c @@ -312,7 +312,7 @@ extract(char *tarfile, char *rootdir) return 0; } - +#if !defined(_WIN32) || defined(__CYGWIN__) static void usage() { @@ -322,7 +322,7 @@ usage() progname); exit(-1); } - +#endif #define MODE_LIST 1 #define MODE_CREATE 2 |