summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'findopenssl-win64'Brad King2010-06-241-10/+28
|\
| * Apply patch from B. King on MLMathieu Malaterre2010-06-221-2/+2
| |
| * Cleanup FindOpenSSL. Add support for win64 installation.Mathieu Malaterre2010-06-151-10/+28
| |
* | Merge branch 'test-HTML-xmllint-nonet'Brad King2010-06-245-3/+1509
|\ \
| * | Run CMake.HTML test with older xmllint (#10857)Brad King2010-06-231-11/+19
| | | | | | | | | | | | | | | Old versions of xmllint do not have --nonet or --path options. Fall back to the network-access form in this case.
| * | Run CMake.HTML test without net access (#10857)Brad King2010-06-225-1/+1499
| | | | | | | | | | | | | | | Use xmllint's --nonet option to avoid downloading the xhtml DTD. Provide the DTD and its dependencies locally.
* | | Merge branch 'CudaRTEmuLibraryForCUDA30'Brad King2010-06-241-2/+23
|\ \ \
| * | | Add support for the emulation version of the cudart library.James Bigler2010-06-211-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'ctest-git-empty-commits'Brad King2010-06-244-4/+32
|\ \ \ \
| * | | | CTest: Parse empty Git commits correctlyBrad King2010-06-234-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'vs10-path-issue'Brad King2010-06-241-1/+3
|\ \ \ \ \
| * | | | | For VS10: Really use full path file names.David Cole2010-06-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'fix-ctest-parallel'Brad King2010-06-242-1/+3
|\ \ \ \ \ \
| * | | | | | Parallel CTest hangs if serial test has dependsZach Mullen2010-06-232-1/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'fix-ExternalProject-test-failures'Brad King2010-06-241-5/+4
|\ \ \ \ \ \
| * | | | | | Qualify name of extraction location with ExternalProject name.David Cole2010-06-231-5/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'fix_ctest_failure_code'Brad King2010-06-243-2/+8
|\ \ \ \ \ \
| * | | | | | Fix for bug #10859, ctest exit exception incorrectly reported.Bill Hoffman2010-06-223-2/+8
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | CTest was using the return value from the program instead of the exit exception value for the process.
* | | | | | KWSys Nightly Date StampKWSys Robot2010-06-241-1/+1
| |/ / / / |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-231-1/+1
| | | | |
* | | | | Merge branch 'finddcmtk'Brad King2010-06-221-148/+118
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Cleanup FindDCMTK (using foreach). Fix linking on win32 static libs.Mathieu Malaterre2010-06-151-148/+118
| | | | |
* | | | | Merge branch 'fix-CheckSourceTree-test'Brad King2010-06-221-0/+54
|\ \ \ \ \
| * | | | | Look in the ctest ini file for GitCommand.David Cole2010-06-211-0/+54
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'script-mode-keep-makeflags'Brad King2010-06-221-10/+10
|\ \ \ \ \
| * | | | | Preserve ENV{MAKEFLAGS} in CMake script modeBrad King2010-06-211-10/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'vs10-path-issue'Brad King2010-06-223-5/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Use full path file names to express dependencies.David Cole2010-06-212-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Use full path file names in generate.stamp.list.David Cole2010-06-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The full path file names are important for Visual Studio 10, which apparently changes the current working directory when running custom command rules.
* | | | | Merge branch 'remove-bad-paths-from-CMakeVSFind-modules'Brad King2010-06-222-7/+0
|\ \ \ \ \
| * | | | | Remove "Microsoft Visual Studio .NET" from VS8 and VS9 find modules.David Cole2010-06-162-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake was incorrectly finding devenv from Visual Studio 7.1 installations when asked to generate using Visual Studio 9 2008. Now, it will not.
* | | | | | Merge branch 'FixCudaVersionAfterFirstRun'Brad King2010-06-221-0/+4
|\ \ \ \ \ \
| * | | | | | CUDA_VERSION variable passed to REGEX needs quotes to work when not defined.James Bigler2010-06-151-2/+2
| | | | | | |
| * | | | | | Fixed: CUDA_VERSION_MAJOR/MINOR now computed after first run.James Bigler2010-05-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA_VERSION_MAJOR and CUDA_VERSION_MINOR were only computed when CUDA_VERSION was first computed. Subsequent runs of FindCUDA would not have CUDA_VERSION_MAJOR/MINOR set. We now extract the major and minor versions from the CUDA_VERSION cache variable every run.
* | | | | | | Merge branch 'doc_ctest_build_target'Brad King2010-06-221-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Document ctest_build() TARGET optionZach Mullen2010-06-151-3/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix-stoptime-mem-leak'Brad King2010-06-225-6/+32
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Do not exit if stoptime is passed.Zach Mullen2010-06-155-6/+32
| |/ / / / /
* | | | | | KWSys Nightly Date StampKWSys Robot2010-06-221-1/+1
| |_|_|_|/ |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-211-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-201-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-191-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-181-1/+1
| |_|_|/ |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2010-06-171-1/+1
| |_|/ |/| |
* | | KWSys Nightly Date StampKWSys Robot2010-06-161-1/+1
| | |
* | | Merge branch 'remove-CTestTest3'Brad King2010-06-151-13/+0
|\ \ \
| * | | Remove CTestTest3.David Cole2010-06-131-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At this point, CTestTest3 causes more problems than it's worth. It uses CVS to grab a remote (over the network) copy of kwsys code for testing. This causes some sort of problem nearly every night on the nightly CMake dashboards. Worse: it causes problems on different machines on different nights, then the next day, it's fine again. So: remove this test and monitor the coverage. If we lose a significant portion of code coverage, I will revert this commit and re-activate the test. However, if we do not lose a significant portion of code coverage, I will remove the code for the test as well as removing it from the CMakeLists.txt file. Brad King and I discussed this over the last few weeks, and we both think we have sufficient coverage of all the checkout and update code in other locally (non-network) based tests. On the other hand, even if we do take a mild hit on coverage temporarily, it should be relatively easy to increase our coverage again by adding bits to those other locally based tests.
* | | | Merge branch 'ctest-git-flexibility'Brad King2010-06-1512-44/+157
|\ \ \ \
| * | | | ctest_update: Support Git upstream branch rewritesBrad King2010-06-086-16/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'git fetch' followed by 'git reset' to update the source tree. This is better than 'git pull' because it can handle a rewritten upstream branch and does not leave local modifications. After fetch, parse FETCH_HEAD to find the merge head that 'git pull' would choose to track the upstream branch. Then reset to the selected head. In the normal fast-forward case the behavior remains unchanged. However, now local modifications and commits will be erased, and upstream rewrites are handled smoothly. This ensures that the upstream branch is tested as expected.
| * | | | ctest_update: Support custom Git update commandBrad King2010-06-085-16/+95
| | | | | | | | | | | | | | | | | | | | | | | | | Define CTest configuration variable CTEST_GIT_UPDATE_CUSTOM to set a custom command line for updating Git-managed source trees.