summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'resolve/doc-spelling/CPackRPM'Brad King2010-07-204-7/+7
|\ | | | | | | | | | | 7739d78 Merge CPackRPM changes into doc-spelling 9203e91 Fix spelling errors reported by Lintian.
| * Merge CPackRPM changes into doc-spellingBrad King2010-07-135-177/+131
| |\ | | | | | | | | | | | | Conflicts: Modules/CPackRPM.cmake
| * | Fix spelling errors reported by Lintian.Kai Wasserbäch2010-07-134-7/+7
| | | | | | | | | | | | | | | During a Lintian run on the binary packages of CMake in Debian I was notified of many spelling mistakes.
* | | Merge topic 'resolve/ctest-file-checksum/remove-CTestTest3'Brad King2010-07-132-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38c762c Merge 'remove-CTestTest3' into ctest-file-checksum 46df0b4 Activate retry code on any curl submit failure. 8705497 Checksum test should use CMAKE_TESTS_CDASH_SERVER d0d1cdd Mock checksum failure output for old CDash versions af5ef0c Testing for CTest checksum 86e81b5 CTest should resubmit in the checksum failed case d6b7107 Fix subscript out of range crash 082c87e Cross-platform fixes for checksum/retry code e525649 Checksums on CTest submit files, and retry timed out submissions.
| * \ \ Merge 'remove-CTestTest3' into ctest-file-checksumBrad King2010-07-1311-36/+305
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: Tests/CMakeLists.txt
| * | | | Cross-platform fixes for checksum/retry codeZach Mullen2010-06-031-2/+2
| | | | |
| * | | | Checksums on CTest submit files, and retry timed out submissions.Zach Mullen2010-06-032-1/+12
| | | | |
* | | | | Merge topic 'external-project-launcher'Brad King2010-07-131-0/+137
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b2634b6 Detect CMake warnings and errors in build output. 012c986 ExternalProject: Add LOG_* options to hide step output
| * | | | | Detect CMake warnings and errors in build output.David Cole2010-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix niggly in ExternalProject that would inadvertently create a log file of output when a command was explicitly set to the empty string. Also, increase the default value for showing context around build errors to 10 lines, up from 6. Also add the ability to customize this setting so that users can put it back to 6 or even lower if they want, or show more if they want.
| * | | | | ExternalProject: Add LOG_* options to hide step outputBrad King2010-06-211-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'CPackRPM-RelocatablePackage'Brad King2010-07-131-2/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 604c369 CPackRPM:: [partially] support relocatable package
| * | | | | | CPackRPM:: [partially] support relocatable packageEric NOULARD2010-07-091-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The support is partial because it cannot be used if CPACK_SET_DESTDIR is set some file are installed using absolute path
* | | | | | | Merge topic 'FindPostgreSQL'Brad King2010-07-131-0/+181
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56da481 Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS. 106de67 Forgot the copyright notice. 5ecfe16 Adding a FindPostgreSQL.cmake module
| * | | | | | | Changed ADDITIONAL_SEARCH_PATHS to PostgreSQL_ADDITIONAL_SEARCH_PATHS.Andrew Maclean2010-07-091-2/+2
| | | | | | | |
| * | | | | | | Forgot the copyright notice.Andrew Maclean2010-07-081-0/+14
| | | | | | | |
| * | | | | | | Adding a FindPostgreSQL.cmake moduleAndrew Maclean2010-07-071-0/+167
| |/ / / / / /
* | | | | | | Merge topic 'findqt4-cross-compile'Brad King2010-07-133-247/+243
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7fd3739 Find correct Qt plugins for cross-compiling. ff888dd Fix some issues with refinding when qmake executable is changed. 22e725f Tweak for cygwin, don't convert : to ; b55da4c Add cross-compiling support to FindQt4.cmake
| * | | | | | Find correct Qt plugins for cross-compiling.Clinton Stimpson2010-07-061-1/+7
| | | | | | |
| * | | | | | Fix some issues with refinding when qmake executable is changed.Clinton Stimpson2010-07-061-0/+7
| | | | | | |
| * | | | | | Tweak for cygwin, don't convert : to ;Clinton Stimpson2010-07-031-2/+2
| | | | | | |
| * | | | | | Add cross-compiling support to FindQt4.cmakeClinton Stimpson2010-07-023-246/+229
| | | | | | |
* | | | | | | Merge branch 'CPackRPM-handleFileWithSpace'Brad King2010-07-061-3/+4
|\ \ \ \ \ \ \
| * | | | | | | CPackRPM:: Quote every filenames in %file section (see bugs 10701,10871,10345)Eric NOULARD2010-07-041-3/+4
| |/ / / / / /
* | | | | | | Merge branch 'CPackRPM-VariousEnhancement-0010741'Brad King2010-07-061-88/+97
|\ \ \ \ \ \ \
| * | | | | | | Provides default changelog if no file is providedEric NOULARD2010-07-041-0/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | clean up some stuff in CPack RPM scriptRolf Eike Beer2010-07-041-88/+95
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -remove trailing whitespace -fix description of CPACK_RPM_PACKAGE_SUMMARY -fix description of CPACK_RPM_PACKAGE_VENDOR -fix description of CPACK_RPM_PACKAGE_PROVIDES -do not put changelog of that file to generated RPM but read it from CPACK_RPM_CHANGELOG_FILE -add CPACK_RPM_PACKAGE_URL -add CPACK_RPM_PACKAGE_OBSOLETES -add CPACK_RPM_PACKAGE_SUGGESTS -add a loop so adding more user supplied header fields is easy Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | | | | Merge branch 'CPackRPM-fixDashInRPMVersion'Brad King2010-07-061-0/+5
|\ \ \ \ \ \
| * | | | | | CPackRPM:: Replace - with _ in RPM Version (fix bug 0010934)Eric NOULARD2010-07-041-0/+5
| |/ / / / /
* | | | | | Merge branch 'FindMPI-flag-parsing'Brad King2010-07-061-11/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | FindMPI: Fix parsing of mpicc -Wl,-L link flags (#9093)Brad King2010-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit d84cbd0f (FindMPI: Parse mpicc flags more carefully, 2010-06-24) broke parsing of '-L' flags appearing after '-Wl,' by expecting a preceding space. Update the regular expression to allow '-Wl,-L' too.
| * | | | | FindMPI: Failure is not an error if not REQUIREDBrad King2010-06-281-3/+3
| | | | | |
| * | | | | FindMPI: Parse mpicc flags more carefully (#9093)Brad King2010-06-251-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | FindMPI: Do not parse -l in middle of library nameBrad King2010-06-241-2/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | 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 '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.
* | | | | 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.
* | | | 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 '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.
* | | | | 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 '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 'remove-bad-paths-from-CMakeVSFind-modules'Brad King2010-06-222-7/+0
|\ \ \ \