diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | DartLocal.conf.in | 121 | ||||
| -rw-r--r-- | Modules/FindCUDA.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindCUDA/run_nvcc.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Source/kwsys/ProcessWin32.c | 17 | ||||
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 12 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 10 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 1 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini5_release.cmake | 1 |
11 files changed, 50 insertions, 136 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14f60ae..71850de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -552,10 +552,6 @@ endif() # setup some Testing support (a macro defined in this file) CMAKE_SETUP_TESTING() -configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/DartLocal.conf.in" - "${CMAKE_CURRENT_BINARY_DIR}/DartLocal.conf" - COPYONLY) if(NOT CMake_TEST_EXTERNAL_CMAKE) if(NOT CMake_VERSION_IS_RELEASE) diff --git a/DartLocal.conf.in b/DartLocal.conf.in deleted file mode 100644 index e28cb18..0000000 --- a/DartLocal.conf.in +++ /dev/null @@ -1,121 +0,0 @@ -ExpectedBuilds: \ -{andoria.kitware Linux-g++3.4-KDevelop} \ -{andoria.kitware Linux-g++3.4-SVN} \ -{DASH1.kitware Win32-nmake71} \ -{DASH1.kitware Win32-vs71} \ -{DASH1.kitware Win32-vs71Rel} \ -{DASH1.kitware zRel24-Win32-nmake71} \ -{DASH1.kitware zRel24-Win32-vs71} \ -{DASH11.kitware zRel24-Win32-nmake71} \ -{dash14.kitware Win32-bcc5.6} \ -{dash14.kitware Win32-cygwin} \ -{dash14.kitware Win32-mingw} \ -{dash14.kitware zRel24-Win32-bcc5.6} \ -{dash17.kitware Linux-g++4.0} \ -{dash1win64.kitware Win64-vs80} \ -{dash1win98.kitware Win32-vs60} \ -{DASH2.kitware Win32-nmake70} \ -{DASH2.kitware Win32-vs70} \ -{DASH2.kitware Win32-vs70-InPlace} \ -{DASH2.kitware zRel24-Win32-nmake70} \ -{DASH2.kitware zRel24-Win32-vs70} \ -{DASH3.kitware Win32-nmake60} \ -{DASH3.kitware Win32-vs60} \ -{DASH3.kitware zRel24-Win32-nmake60} \ -{DASH3.kitware zRel24-Win32-vs60} \ -{dash4.kitware Win32-bcc5.8} \ -{DASH5.kitware Linux-gcc332-InPlace} \ -{DASH5.kitware zRel24-Linix-gcc332} \ -{DASH6.kitware zRel24-Linix-gcc332} \ -{dash8.kitware Linux64-g++} \ -{dash8.kitware Linux64-g++332} \ -{dash8.kitware Linux64-g++341} \ -{dash8.kitware zRel24-Linux64-g++} \ -{dash8.kitware zRel24-Linux64-g++332} \ -{dashmacmini1.kitware Darwin-Tiger-Xcode21} \ -{dashmacmini1.kitware zRel24-Darwin-Tiger-g++} \ -{dashmacmini2.kitware DarwinIntel-g++} \ -{dashmacmini2.kitware DarwinIntel-Universal} \ -{dashmacmini2.kitware Darwin-Tiger-Xcode21-univ} \ -{dashmacmini3.kitware Darwin-LeopardIntel-g++} \ -{dashmacmini3.kitware Darwin-LeopardIntel-Universal} \ -{dashmacmini3.kitware Darwin-Leopard-Xcode21-univ} \ -{dashsgi1.kitware IRIX32-CC} \ -{dashsgi1.kitware IRIX64-CC} \ -{dashsun1.kitware SunOS-CC} \ -{dashsun1.kitware SunOS-CC-64} \ -{dashsun1.kitware SunOS-gcc34-64} \ -{destiny.kitware HP-UX-aCC} \ -{destiny.kitware HP-UX-aCC-gmake} \ -{devqnx.acfr.usyd.edu.au qnx-V3.3.5-gcc_ntox86} \ -{grayson.kitware Win32-nmake80} \ -{heart HP-UXia64-aCC} \ -{hythloth.kitware Linux64-bullseye-cov} \ -{hythloth.kitware Linux64-suncc-5.9} \ -{hythloth.kitware Linux-nightly-win32-release} \ -{insight.journal.kitware KWStyle} \ -{iris.elemtech IRIX64-CC64-7.4} \ -{iris.elemtech IRIX64-CC-7.4} \ -{JET.kitware Linux-valgrind2} \ -{krondor.kitware Darwin-c++} \ -{krondor.kitware zRel24-Darwin-c++} \ -{midworld.kitware DarwinG5-g++} \ -{midworld.kitware DarwinG5-XCode15} \ -{midworld.kitware zRel24-DarwinG5-g++} \ -{pre.vision.cs.rpi.edu FreeBSD-CC-gmake} \ -{pre.vision.cs.rpi.edu FreeBSD-CC-make} \ -{RogueResearch3 Mac10.5-CMake-gcc-dbg-ppc} \ -{RogueResearch3 Mac10.5-CMake-gcc-dbg-ppc64} \ -{RogueResearch3 Mac10.5-CMake-gcc-rel-ppc} \ -{RogueResearch3 Mac10.5-CMake-gcc-rel-ppc64} \ -{RogueResearch3 Mac10.5-CMake-Xcode-dbg-ppc} \ -{RogueResearch3 Mac10.5-CMake-Xcode-dbg-ppc64} \ -{RogueResearch4 Mac10.5-CMake-gcc-dbg-i386} \ -{RogueResearch4 Mac10.5-CMake-gcc-dbg-rosetta} \ -{RogueResearch4 Mac10.5-CMake-gcc-rel-i386} \ -{tick.rz.uni-augsburg.de LinuxPPC-g++3.3} \ -{tick.rz.uni-augsburg.de LinuxPPC-g++3.4} \ -{trinsic.kitware Win32-mingw} \ -{r06n01.pbm.ihost.com AIX53-xlC} \ -{r06n01.pbm.ihost.com zRel24-AIX53-xlC} \ -{valhalla.kitware Win32-wcl386} - -#{devqnx.acfr.usyd.edu.au qnx-V3.3.5-gcc_ntox86 } \ -#{mr-orange.obtech.net gentoo-linux-x86\_64-gcc-4.0.2 } \ -#{G5.Nfsnet.Org Darwin8.3-gcc4} \ - -# commas in names do not work for expected builds.... - -#{G4.Nfsnet.Org Darwin-c++} \ -#{salmon.nlm.nih.gov Darwin8.7-gcc4} \ - -#{crd.ge.com Solaris-gcc343} \ -#{crd.ge.com Linux-icc81} \ -#{crd.ge.com Windows-bcc32} \ -#{crd.ge.com Windows-nmake71} \ -#{crd.ge.com Windows-nmake60} \ - -#{dash16.kitware Linux-g++4.0} \ -#{styx Linuxia64-g++} \ -#{crd.ge.com Cygwin-gcc344} \ -#{valhalla.kitware Win32-bccRel} \ -#{valhalla.kitware Win32-bcc} \ -#{valhalla.kitware Win32-g++} \ -#{valhalla.kitware Win32-nmake60} \ -#{valhalla.kitware Win32-nmake70} \ -#{valhalla.kitware Win32-vs60} \ -#{valhalla.kitware Win32-vs70} -#{crd.ge.com FreeBSD-gcc321} \ -#{crd.ge.com Linux-gcc320} \ - -#{cogattaca.kitware LinuxWin32-g++-Werror} \ -#{cogattaca.kitware LinuxWin32-g++} \ - -#{dash8.kitware Win64-icl80} \ -#{dash8.kitware zLRB-Win64-icl80} \ - -#{hythloth.kitware Linux-icc-8.1} \ - -CompressionMode: ALL -CompressionCommand: /bin/gzip -CompressionType: gzip diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 9348aa5..2e2b21c 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -894,15 +894,15 @@ macro(CUDA_GET_SOURCES_AND_OPTIONS _sources _cmake_options _options) set( ${_options} ) set( _found_options FALSE ) foreach(arg ${ARGN}) - if(arg STREQUAL "OPTIONS") + if("x${arg}" STREQUAL "xOPTIONS") set( _found_options TRUE ) elseif( - arg STREQUAL "WIN32" OR - arg STREQUAL "MACOSX_BUNDLE" OR - arg STREQUAL "EXCLUDE_FROM_ALL" OR - arg STREQUAL "STATIC" OR - arg STREQUAL "SHARED" OR - arg STREQUAL "MODULE" + "x${arg}" STREQUAL "xWIN32" OR + "x${arg}" STREQUAL "xMACOSX_BUNDLE" OR + "x${arg}" STREQUAL "xEXCLUDE_FROM_ALL" OR + "x${arg}" STREQUAL "xSTATIC" OR + "x${arg}" STREQUAL "xSHARED" OR + "x${arg}" STREQUAL "xMODULE" ) list(APPEND ${_cmake_options} ${arg}) else() diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index 58e0d31..abdd307 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -126,7 +126,7 @@ endif() # and other return variables are present after executing the process. macro(cuda_execute_process status command) set(_command ${command}) - if(NOT _command STREQUAL "COMMAND") + if(NOT "x${_command}" STREQUAL "xCOMMAND") message(FATAL_ERROR "Malformed call to cuda_execute_process. Missing COMMAND as second argument. (command = ${command})") endif() if(verbose) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 90550db..7d293ef 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 0) -set(CMake_VERSION_PATCH 20140927) +set(CMake_VERSION_PATCH 20140929) #set(CMake_VERSION_RC 1) diff --git a/Source/kwsys/ProcessWin32.c b/Source/kwsys/ProcessWin32.c index c8ec754..ef71f26 100644 --- a/Source/kwsys/ProcessWin32.c +++ b/Source/kwsys/ProcessWin32.c @@ -36,6 +36,9 @@ a UNIX-style select system call. #pragma warning (push, 1) #endif #include <windows.h> /* Windows API */ +#if defined(_MSC_VER) && _MSC_VER >= 1800 +# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx +#endif #include <string.h> /* strlen, strdup */ #include <stdio.h> /* sprintf */ #include <io.h> /* _unlink */ @@ -335,7 +338,14 @@ kwsysProcess* kwsysProcess_New(void) windows. */ ZeroMemory(&osv, sizeof(osv)); osv.dwOSVersionInfoSize = sizeof(osv); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (push) +# pragma warning (disable:4996) +#endif GetVersionEx(&osv); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (pop) +#endif if(osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { /* Win9x no longer supported. */ @@ -2370,7 +2380,14 @@ static kwsysProcess_List* kwsysProcess_List_New(void) /* Select an implementation. */ ZeroMemory(&osv, sizeof(osv)); osv.dwOSVersionInfoSize = sizeof(osv); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (push) +# pragma warning (disable:4996) +#endif GetVersionEx(&osv); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (pop) +#endif self->NT4 = (osv.dwPlatformId == VER_PLATFORM_WIN32_NT && osv.dwMajorVersion < 5)? 1:0; diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 2521aac..84b5f39 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -60,6 +60,9 @@ #if defined(_WIN32) # include <windows.h> +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# endif # include <errno.h> # if defined(KWSYS_SYS_HAS_PSAPI) # include <psapi.h> @@ -3786,7 +3789,7 @@ bool SystemInformationImplementation::QueryLinuxMemory() return false; } - if( unameInfo.release!=0 && strlen(unameInfo.release)>=3 ) + if( strlen(unameInfo.release)>=3 ) { // release looks like "2.6.3-15mdk-i686-up-4GB" char majorChar=unameInfo.release[0]; @@ -5063,6 +5066,10 @@ bool SystemInformationImplementation::QueryOSInformation() // Try calling GetVersionEx using the OSVERSIONINFOEX structure. ZeroMemory (&osvi, sizeof (OSVERSIONINFOEXW)); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (push) +# pragma warning (disable:4996) +#endif bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi); if (!bOsVersionInfoEx) { @@ -5072,6 +5079,9 @@ bool SystemInformationImplementation::QueryOSInformation() return false; } } +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (pop) +#endif switch (osvi.dwPlatformId) { diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 8a61267..b1221e3 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -82,6 +82,9 @@ # ifndef INVALID_FILE_ATTRIBUTES # define INVALID_FILE_ATTRIBUTES ((DWORD)-1) # endif +# if defined(_MSC_VER) && _MSC_VER >= 1800 +# define KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# endif #elif defined (__CYGWIN__) # include <windows.h> # undef _WIN32 @@ -4629,6 +4632,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() ZeroMemory(&osvi, sizeof(OSVERSIONINFOEXA)); osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (push) +# pragma warning (disable:4996) +#endif bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO *)&osvi); if (!bOsVersionInfoEx) { @@ -4638,6 +4645,9 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion() return 0; } } +#ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx +# pragma warning (pop) +#endif switch (osvi.dwPlatformId) { diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5b336ce..f27949a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2609,7 +2609,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release set(regex "${regex}|Error message was: ") set(regex "${regex}([Cc]ould *n.t resolve host") set(regex "${regex}|[Cc]ould *n.t connect to host") - set(regex "${regex}|Failed connect to") + set(regex "${regex}|Failed *t*o* connect to") set(regex "${regex}|Empty reply from server") set(regex "${regex}|The requested URL returned error") set(regex "${regex}|libcurl was built with SSL disabled. https: not supported)") diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 6a27119..ba82aab 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -6,6 +6,7 @@ set(HOST dashmacmini2) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j2") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") +set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386 diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index 16a30b3..d332816 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -7,6 +7,7 @@ set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") set(CPACK_BINARY_GENERATORS "DragNDrop TGZ TZ") set(CPACK_SOURCE_GENERATORS "TGZ TZ") +set(CPACK_DMG_FORMAT "UDBZ") #build using bzip2 for smaller package size set(INITIAL_CACHE " CMAKE_USE_OPENSSL:BOOL=ON OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1g-install/lib/libcrypto.a |