summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | Generalize CTest.Update* test dashboard script helpersBrad King2010-06-086-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach (create|run)_dashboard_script macros to treat the argument as the name of a build tree. Append '.cmake' to generate the dashboard script name. This allows future re-use of the macros for multiple test scripts.
* | | | | Merge branch 'vs10-source-groups'Brad King2010-06-152-0/+53
|\ \ \ \ \
| * | | | | Fix nested source groups with VS 10 (#9863)Christoph Watzl2010-06-112-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add intermediate (but empty) source group filters for the container groups.
* | | | | | Merge branch 'coverage_exclusion_from_glob'Brad King2010-06-151-2/+6
|\ \ \ \ \ \
| * | | | | | Extra coverage glob should subtract the explicitly defined excluded filesZach Mullen2010-06-111-2/+6
| |/ / / / /
* | | | | | Merge branch 'make_libarchive_use_cmzlib'Brad King2010-06-151-0/+1
|\ \ \ \ \ \
| * | | | | | Make sure libarchive uses cmzlib and not the system libz if found.Bill Hoffman2010-06-111-0/+1
| |/ / / / /
* | | | | | Merge branch 'msys-bootstrap-test'Brad King2010-06-152-5/+15
|\ \ \ \ \ \
| * | | | | | Enable BootstrapTest on MSYSBrad King2010-06-112-5/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootstrap script works under MSYS, so test it. Use a launcher batch file since 'ctest --build-and-test' is a Windows program and will not honor the shebang line in the script.
* | | | | | Merge branch 'remove-qmake-query'Brad King2010-06-152-30/+5
|\ \ \ \ \ \
| * | | | | | Remove macro for querying qmake for qmake variables.Clinton Stimpson2010-06-122-30/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove last place for querying qmake values. Also removed internal macro to support querying qmake. Depends on findthreads-irix topic.
* | | | | | | Merge branch 'findthreads-irix'Brad King2010-06-151-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Support pthreads on irix.Clinton Stimpson2010-06-121-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'tru64-make-includes'Brad King2010-06-153-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Tru64: Use full-path include directives in Makefiles (#10569)Brad King2010-06-143-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tru64's make(1) resolves relative paths in "include" directives with respect to the includer. This is inconsistent with all other known make tools. Note that this make tool treats the path literally so we cannot use our standard FULL path code which escapes spaces. Instead qualify the paths with $(CMAKE_BINARY_DIR) to avoid the problem.
* | | | | | | | Merge branch 'tru64-cmOStringStream-vtable'Brad King2010-06-154-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Tru64: Place cmOStringStream vtable uniquely (#10541)Brad King2010-06-104-1/+20
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC places the vtable in the object implementing the first non-pure, non-inline virtual method. Since the symbol is not weak on Tru64, make the location unique by putting the destructor in a single object file.
* | | | | | | | Merge branch 'test-NoNewline-with-built-cmake'Brad King2010-06-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Run CTest.NoNewline test using built CMakeBrad King2010-06-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though this test is checking that the ctest running it can handle test output without newlines we should run the just-built CMake binary. This allows the MemCheck test mode to check the correct CMake.
* | | | | | | | | Merge branch 'fix-issue-10346'Brad King2010-06-151-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #10346. Error if SOURCE_DIR is empty.David Cole2010-06-091-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://public.kitware.com/Bug/view.php?id=10346. The proposed patch for the issue could not be applied as is because the SOURCE_DIR always exists for an ExternalProject_Add call by the time we get to the place to emit the potential error. The fix is to emit the error only if the source dir is empty. By which, I mean devoid of files and subdirectories. If SOURCE_DIR is used by itself, without any DOWNLOAD_COMMAND or repository info, then it implies that the SOURCE_DIR is ready to build as-is without need for a download step. Clearly, if it is empty, then it is not ready to build as is. So complain if the SOURCE_DIR is empty.
* | | | | | | | | | Merge branch 'cygwin-data-dirs'Brad King2010-06-152-14/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix CMake data and doc paths in Cygwin packageBrad King2010-06-092-14/+12
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override CMAKE_DOC_DIR and CMAKE_DATA_DIR cache entries on Cygwin early enough so the new values are used everywhere. Previously only some of the uses were overridden. Also set CPACK_PACKAGE_VERSION to the whole CMake_VERSION so that the Cygwin MANIFEST file goes in the proper path.
* | | | | | | | | | Merge branch 'source-file-property-documentation'Brad King2010-06-152-29/+11
|\ \ \ \ \ \ \ \ \ \