summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* KWSys Nightly Date StampKWSys Robot2010-06-301-1/+1
|
* Merge branch 'FindMPI-BlueGene-L'Brad King2010-06-291-6/+0
|\
| * FindMPI: Trust mpicc -showme on BlueGene/LBrad King2010-06-281-6/+0
| | | | | | | | | | | | | | | | Do not hard-code known BlueGene/L MPI libraries. We do not know their location so the linker cannot find them without the proper -L search path. The MPI compiler tells us about the libraries anyway, and if it does not then the user can fix the problem locally by editing the MPI_EXTRA_LIBRARY cache entry.
* | Merge branch 'vs-ps3-projects'Brad King2010-06-291-10/+3
|\ \
| * | VS: Always separate preprocessor defs by semicolon (#10902)Brad King2010-06-281-10/+3
| | | | | | | | | | | | | | | | | | Separation by ',' only works in VS 2008 and below and does not work in the PlayStation3 VS plugin. Separation by ';' works in VS 10 and all prior versions.
* | | Merge branch 'fix-warnings'Brad King2010-06-297-17/+22
|\ \ \
| * | | Eliminate -Wconversion warnings.David Cole2010-06-277-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | Change types of local variables, or casting, or re-arrange expressions to get rid of "conversion may alter value" warnings as seen on recent dashboard submissions from londinium.kitware.
* | | | Merge branch 'improve-CheckSourceTree-test'Brad King2010-06-291-6/+57
|\ \ \ \
| * | | | CheckSourceTree test: read UpdateCommand from Update.xml.David Cole2010-06-271-6/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If GIT_EXECUTABLE is not passed in, and is not available from DartConfiguration.tcl or CTestConfiguration.ini, then make one more last ditch attempt to get it from Update.xml, if there is an Update.xml. For dashboards that have successfully done a ctest_update call, there should be an Update.xml in the Testing subdir of the binary tree. Parse that file for the git executable recorded in the <UpdateCommand> element. And make this test pass on those RogueResearch dashboard machines!
* | | | | Merge branch 'qt4-configdeps-standardmodules'Brad King2010-06-291-82/+24
|\ \ \ \ \
| * | | | | Change Qt4ConfigDependentSettings to use more standard find modules.Clinton Stimpson2010-06-251-82/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'getprerequisites-bug10418'Brad King2010-06-291-1/+12
|\ \ \ \ \ \
| * | | | | | Fix regression in 5e6634fd77969433a87c150a2fb3f2079131484f for Windows.Clinton Stimpson2010-06-241-3/+3
| | | | | | |
| * | | | | | Fix bug 10418 - GetPrerequisites returning "not" as a dependency.Clinton Stimpson2010-06-241-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'zlib-version-perf'Brad King2010-06-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix performance issue with getting version from zlib.hClinton Stimpson2010-06-241-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | KWSys: Pass ptrdiff_t check result to System.cBrad King2010-06-291-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit "Provide unix-sytle command line parsing" (2009-07-13) the reference to KWSYS_C_HAS_PTRDIFF_T in System.c has been meaningless because the macro was never passed to the compiler!
* | | | | | | KWSys: Cleanup putenv leak option implementationBrad King2010-06-292-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define KWSYS_DO_NOT_CLEAN_PUTENV only for the implementation. It does not need to be configured in the interface of "Configure.hxx".
* | | | | | | KWSys Nightly Date StampKWSys Robot2010-06-291-1/+1
| | | | | | |
* | | | | | | Begin post-2.8.2 developmentBrad King2010-06-281-2/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake 2.8.2v2.8.2Brad King2010-06-282-1/+3
| | | | | |
* | | | | | Merge branch 'release'Brad King2010-06-282-4/+83
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | CMake 2.8.2-rc4Brad King2010-06-242-1/+24
| | | | | |
| * | | | | Merge branch 'release'Brad King2010-06-242-4/+60
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | CMake 2.8.2-rc3Brad King2010-06-222-1/+23
| | | | | |
| | * | | | Merge branch 'release'Brad King2010-06-222-4/+38
| | |\ \ \ \
| | | * | | | CMake 2.8.2-rc2Brad King2010-06-152-1/+35
| | | | | | |
| | | * | | | Merge branch 'release'Brad King2010-06-152-4/+4
| | | |\ \ \ \
| | | | * | | | ChangeLog: Mention "current" and "since" versionsBrad King2010-06-151-1/+1
| | | | | | | |
| | | | * | | | CMake 2.8.2-rc1Brad King2010-06-111-3/+3
| | | | | | | |
* | | | | | | | KWSys Nightly Date StampKWSys Robot2010-06-281-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | KWSys Nightly Date StampKWSys Robot2010-06-271-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | KWSys Nightly Date StampKWSys Robot2010-06-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | KWSys Nightly Date StampKWSys Robot2010-06-251-1/+1
|/ / / /
* | | | 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.