Commit Graph

14836 Commits

Author SHA1 Message Date
Clinton Stimpson 2aa515db9e Change Qt4ConfigDependentSettings to use more standard find modules.
Let's use more standard find modules for Qt4 dependencies.  Move a few
from using pkg-config so we can do cross compiling the cmake way.
2010-06-25 13:15:10 -06:00
Bill Hoffman 696a0af220 Disable gcc 33 on OpenBSD because it crashes CPack by default.
Make sure no one tries to use gcc 33 based tools to build CMake.
This is because a cpack test failed with a crash.  The crash
seems to be caused by the stack checking code on by default in
OpenBSD.  The crash is in some stl code.  The problem is fixed
with newer gcc compilers on OpenBSD.
2010-06-25 12:54:16 -04:00
Brad King 6fc4cd8680 Fix or cast integer conversions in cmake
These were revealed by GCC's -Wconversion option.  Fix types where it is
easy to do so.  Cast in cases we know the integer will not be truncated.
2010-06-25 09:05:15 -04:00
Brad King d84cbd0f77 FindMPI: Parse mpicc flags more carefully (#9093)
Extend the fix from commit 68c7d3e2 (FindMPI: Do not parse -l in middle
of library name, 2010-06-24).  Parse -D, -I, -L, and -Wl only with
preceding spaces or at the beginning of the string.
2010-06-25 08:00:38 -04:00
KWSys Robot da0190a4a7 KWSys Nightly Date Stamp 2010-06-25 00:10:17 -04:00
Clinton Stimpson 9306f1beee Fix regression in 5e6634fd77969433a87c150a2fb3f2079131484f for Windows. 2010-06-24 11:15:00 -06:00
Clinton Stimpson e6f8a86368 Fix bug 10418 - GetPrerequisites returning "not" as a dependency.
ldd can return "not found" and we need to handle it correctly.
In that case, we extract only the name of the library instead of trying for its full path.
2010-06-24 11:15:00 -06:00
Clinton Stimpson 5850b8b79a Fix performance issue with getting version from zlib.h
Some zlib.h files have ZLIB_VERSION "1.2.3.3" with 4 numbers instead of 3.
The regex is changed to grab the first 3 numbers.
It was slow because if it failed to find that string near the top of the file,
where it usually is, it would read the entire file.
2010-06-24 10:52:37 -06:00
Brad King 68c7d3e2ce FindMPI: Do not parse -l in middle of library name
We parse the output of 'mpicc -shome:link' to look for -l options
specifying libraries.  Fix the parsing regex to avoid matching the
string '-l' in the middle of a library name.
2010-06-24 11:07:19 -04:00
Brad King e010d1f688 CMake 2.8.2-rc4 2010-06-24 10:48:52 -04:00
Brad King be4b3c905e Merge branch 'release' 2010-06-24 10:46:48 -04:00
Brad King ec10d005ce Merge branch 'findopenssl-win64' 2010-06-24 10:46:09 -04:00
Brad King 4ad2e64898 Merge branch 'test-HTML-xmllint-nonet' 2010-06-24 10:43:27 -04:00
Brad King 4ac531487b Merge branch 'CudaRTEmuLibraryForCUDA30' 2010-06-24 10:43:05 -04:00
Brad King 566bb2d078 Merge branch 'ctest-git-empty-commits' 2010-06-24 10:41:20 -04:00
Brad King b86a551ede Merge branch 'vs10-path-issue' 2010-06-24 10:40:26 -04:00
Brad King 5890f562e3 Merge branch 'fix-ctest-parallel' 2010-06-24 10:40:19 -04:00
Brad King 83f8697d0e Merge branch 'fix-ExternalProject-test-failures' 2010-06-24 10:36:09 -04:00
Brad King 73144a8f1c Merge branch 'fix_ctest_failure_code' 2010-06-24 10:35:10 -04:00
KWSys Robot 0d400c373e KWSys Nightly Date Stamp 2010-06-24 00:01:06 -04:00
Zach Mullen 1a4c0c55c7 Parallel CTest hangs if serial test has depends 2010-06-23 17:18:59 -04:00
David Cole d710a78a34 For VS10: Really use full path file names.
I naively assumed in my previous commit that the Convert call
would correctly convert a relative path file name correctly
relative to the makefile's current output directory. It actually
converts it relative to the process's current working directory.
So it would be different depending on how you launched cmake-gui.
This commit ensures that the generated files are always the same
by starting with a full path to begin with, based on the makefile
GetCurrentOutputDirectory method.
2010-06-23 16:39:28 -04:00
Brad King bbfe241c6a CTest: Parse empty Git commits correctly
Git's diff-tree format has no '\n'-terminated blank line at the end of
its commit message body block if there are no diff lines.  Instead the
message body is terminated by '\0' and there is no diff section.  Teach
CTest to parse the format in this case.
2010-06-23 09:14:43 -04:00
Brad King 1819d9d617 Run CMake.HTML test with older xmllint (#10857)
Old versions of xmllint do not have --nonet or --path options.
Fall back to the network-access form in this case.
2010-06-23 07:38:33 -04:00
David Cole 67f4759b55 Qualify name of extraction location with ExternalProject name.
Avoid issues with two external projects trying to extract two
separate trees at the same time into the same location. Should
fix the sporadically failing ExternalProject test on the dashboards
for parallel builds.
2010-06-23 07:04:06 -04:00
KWSys Robot b141862564 KWSys Nightly Date Stamp 2010-06-23 00:01:16 -04:00
Zach Mullen 87054972a7 Checksum test should use CMAKE_TESTS_CDASH_SERVER 2010-06-22 11:13:48 -04:00
Mathieu Malaterre fb1eb141b5 Apply patch from B. King on ML 2010-06-22 17:11:39 +02:00
Brad King 7f662c5c62 CMake 2.8.2-rc3 2010-06-22 10:08:36 -04:00
Brad King 9d7fa8b59c Merge branch 'release' 2010-06-22 10:06:53 -04:00
Brad King d39ffaa261 Merge branch 'finddcmtk' 2010-06-22 10:03:29 -04:00
Brad King f56d369786 Merge branch 'fix-CheckSourceTree-test' 2010-06-22 10:00:54 -04:00
Brad King 71cefc35c0 Merge branch 'script-mode-keep-makeflags' 2010-06-22 09:59:20 -04:00
Brad King d4206dc62b Merge branch 'vs10-path-issue' 2010-06-22 09:58:57 -04:00
Brad King 84fd223aee Merge branch 'remove-bad-paths-from-CMakeVSFind-modules' 2010-06-22 09:58:26 -04:00
Brad King 22301dd9e7 Merge branch 'FixCudaVersionAfterFirstRun' 2010-06-22 09:57:29 -04:00
Brad King 0336d822cc Merge branch 'doc_ctest_build_target' 2010-06-22 09:56:53 -04:00
Brad King 3efb7f34a4 Merge branch 'fix-stoptime-mem-leak' 2010-06-22 09:56:39 -04:00
Bill Hoffman 8f8c1edca2 Fix for bug #10859, ctest exit exception incorrectly reported.
CTest was using the return value from the program instead of the
exit exception value for the process.
2010-06-22 09:55:09 -04:00
Brad King 8c0e79f824 Run CMake.HTML test without net access (#10857)
Use xmllint's --nonet option to avoid downloading the xhtml DTD.
Provide the DTD and its dependencies locally.
2010-06-22 09:39:02 -04:00
KWSys Robot d7770578d1 KWSys Nightly Date Stamp 2010-06-22 00:01:22 -04:00
James Bigler bb6acb8667 Add support for the emulation version of the cudart library.
In version 3.0 of the CUDA toolkit when building code for emulation, you need to link
against a new version of the cuda run time library called cudartemu.  This CL adds a check
for the new library and uses it when present and in emulation mode.  Note that this
library is not present in previous or subsequent versions of the CUDA toolkit.
2010-06-21 17:11:57 -06:00
David Cole 4ee426b057 Look in the ctest ini file for GitCommand.
If GIT_EXECUTABLE is not passed into the test, but the source
tree is a git checkout, then use GitCommand or UpdateCommand
from the ctest ini file to set its value. Presumably, a dashboard
running the test suite had to have set this properly in order
to do the ctest_update step.
2010-06-21 14:46:30 -04:00
Brad King 012c986309 ExternalProject: Add LOG_* options to hide step output
Optionally hide the output of each external project build step by
wrapping its command in a launcher script.  Make output available in log
files instead.  This simplifies the output of external project builds.
2010-06-21 13:25:13 -04:00
David Cole 616462ce45 Use full path file names to express dependencies.
This is especially important for the Visual Studio 10
generator and its quirky current working directory
behavior.

Also, emit more information about exactly what files are
out of date when cmakeCheckStampFile returns false.
2010-06-21 11:53:48 -04:00
Brad King 0a7c551bf6 Preserve ENV{MAKEFLAGS} in CMake script mode
Commit 02f7cfbc (Need to remove the MAKEFLAGS when cmake starts,
2003-05-13) removed the MAKEFLAGS environment variable when CMake starts
to prevent try_compile() from inheriting "make -i".  This is unnecessary
in script mode (cmake -P).  Instead remove the variable only when
configuring a project.
2010-06-21 10:50:11 -04:00
KWSys Robot e45a600a0f KWSys Nightly Date Stamp 2010-06-21 00:01:04 -04:00
KWSys Robot dc2f8590d1 KWSys Nightly Date Stamp 2010-06-20 00:01:04 -04:00
KWSys Robot 10c84dc10e KWSys Nightly Date Stamp 2010-06-19 00:01:04 -04:00
KWSys Robot abe355ef1c KWSys Nightly Date Stamp 2010-06-18 00:01:02 -04:00