summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'qt4-fphsa'Brad King2011-02-221-133/+52
|\ | | | | | | | | | | | | 7a1027a When checking find_package() components, special case qtmain. 4c1c358 FindQt4: Include builtin FindPackageHandleStandardArgs directly 43cb9b8 Change to use fphsa to check required variables and version.
| * When checking find_package() components, special case qtmain.Clinton Stimpson2011-02-041-1/+7
| | | | | | | | | | Its just a library on Windows only. Fixes bug #11791.
| * FindQt4: Include builtin FindPackageHandleStandardArgs directlyBrad King2011-01-201-1/+1
| | | | | | | | | | Apply to FindQt4 change from commit b0118402 (Use absolute path to FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28).
| * Change to use fphsa to check required variables and version.Clinton Stimpson2011-01-151-133/+46
| | | | | | | | | | Also, set the required variables based on components, if specified. Also, don't make finding uic required if not using QtGui.
* | Merge topic 'mingw-module-definition'Brad King2011-02-222-1/+5
|\ \ | | | | | | | | | | | | 6a61a8a Honor module .def files with MinGW tools (#9997)
| * | Honor module .def files with MinGW tools (#9997)Brad King2011-02-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 024d05ad (Fix use of module .def files for MS tools, 2009-09-29) module .def files work for any platform that sets CMAKE_LINK_DEF_FILE_FLAG correctly. Set it in the Windows-GNU platform information file to enable support with MinGW tools. Also enable the test added by commit 0db2c850 (Test use of module .def files for MS tools, 2009-09-29) for MinGW and MSYS generators.
* | | Merge topic 'qt4-macfind'Brad King2011-02-221-4/+21
|\ \ \ | | | | | | | | | | | | | | | | 4167be0 Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.
| * | | Fix issues with find_path() for QtCore include dir on Mac. Fixes 11868.Clinton Stimpson2011-02-191-4/+21
| | | |
* | | | Merge topic ↵Brad King2011-02-224-2/+151
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'resolve/add-STRING-subcommand-FIND-issue-11795/fix-2828-more-info-in-script-mode' 1a8eed1 Merge branch 'add-STRING-subcommand-FIND-issue-11795' into fix-2828-more-info-in-script-mode 006124b Avoid direct use of std::stringstream 8a8da36 Merge branch 'fix-2828-more-info-in-script-mode' into add-STRING-subcommand-FIND-issue-11795 1462561 Add a string(FIND) sub-command (#11795)
| * \ \ \ Merge branch 'add-STRING-subcommand-FIND-issue-11795' into ↵Brad King2011-02-171-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | fix-2828-more-info-in-script-mode
| | * | | | Avoid direct use of std::stringstreamBrad King2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In method cmStringCommand::HandleFindCommand added by parent commit use the cmOStringStream compatibility wrapper instead of std::stringstream.
| * | | | | Merge branch 'fix-2828-more-info-in-script-mode' into ↵Brad King2011-02-156-11/+38
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | add-STRING-subcommand-FIND-issue-11795 Conflicts: Tests/CMakeTests/StringTestScript.cmake
| * | | | | Add a string(FIND) sub-command (#11795)Tim Hütz2011-02-154-2/+151
| | | | | |
* | | | | | Merge topic 'fix-2828-more-info-in-script-mode'Brad King2011-02-227-17/+85
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a58ace6 Fix KWStyle line-too-long complaint (#2828) 106958c Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828) 94d1684 Add CMAKE_SCRIPT_MODE_FILE variable (#2828)
| * | | | | | Fix KWStyle line-too-long complaint (#2828)David Cole2011-02-041-1/+2
| | | | | | |
| * | | | | | Add CMAKE_ARGC and CMAKE_ARGV0..N-1 variables (#2828)David Cole2011-02-035-6/+46
| | |/ / / / | |/| | | | | | | | | | | | | | | | For now, these variables are only available in -P script mode.
| * | | | | Add CMAKE_SCRIPT_MODE_FILE variable (#2828)David Cole2011-02-026-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New CMake variable is set when processing a -P script file, but not when configuring a project.
* | | | | | Merge topic 'fix-11877-sort-tests-correctly'Brad King2011-02-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8af8eab Use stable_sort to preserve test order (#11877)
| * | | | | | Use stable_sort to preserve test order (#11877)David Cole2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using sort results in a possibly-modified sorting when all elements are "tied" - use stable_sort instead to preserve the original ordering of tied elements.
* | | | | | | Merge topic 'CPackRPM-HonorAllComponentWays'Brad King2011-02-225-23/+229
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cf1d72 CPackRPM fix IRIX compiler warning (variable never used) 494bb8a CPackRPM honors all the different ways of packaging components
| * | | | | | | CPackRPM fix IRIX compiler warning (variable never used)Eric NOULARD2011-02-151-1/+1
| | | | | | | |
| * | | | | | | CPackRPM honors all the different ways of packaging componentsEric NOULARD2011-02-065-23/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RPM cannot easily 'merge' differents directory into a single RPM with shared prefix. So more flexibility has been added to generic CPackGenerator in order to let the specific generator chose the local installation directory for each component.
* | | | | | | | Merge topic 'AddCustomTargetSourcesToCodeBlocksProject'Brad King2011-02-221-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2a9f7f9 Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)
| * | | | | | | | Also add the SOURCES from add_custom_target() to CodeBlocks projects (#11736)Alex Neundorf2011-02-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CMake 2.6.3 add_custom_target() has a SOURCES option, this was not yet considered in the C::B generator. Also, now GENERATED files are not added to the project. Alex
* | | | | | | | | Merge topic 'FixBadXMLInEclipseProjects'Brad King2011-02-221-7/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 79e13af Add XML escaping for directory name in Eclipse projects (#11658) 8074bca Fix XML escaping for target names in Eclipse project files (#11658) cb94587 Fix XML escaping for the project() name in Eclipse projects (#11658)
| * | | | | | | | | Add XML escaping for directory name in Eclipse projects (#11658)Alex Neundorf2011-02-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | Fix XML escaping for target names in Eclipse project files (#11658)Alex Neundorf2011-02-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | | | | Fix XML escaping for the project() name in Eclipse projects (#11658)Alex Neundorf2011-02-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | | | | Merge topic 'init-LDFLAGS-issue-11840'Brad King2011-02-221-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b77516 Fix linker flag initialization from LDFLAGS (#11840)
| * | | | | | | | | | Fix linker flag initialization from LDFLAGS (#11840)Brad King2011-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When initializing CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS from LDFLAGS and CMAKE_(EXE|SHARED|MODULE)_LINKER_FLAGS_INIT quote the whole string in case both are set. Reported-by: Daniel R. Gomez <gomez@teragram.com>
* | | | | | | | | | | Merge topic 'vs-intel-dll-implib-outdir'Brad King2011-02-224-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2516c05 VS: Create a Fortran DLL's import library directory
| * | | | | | | | | | | VS: Create a Fortran DLL's import library directoryBrad King2011-02-104-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel Fortran plugin forgets to create the output directory into which it will write a DLL's import library. Utilize the fix added by commit f4b3bdc6 (Create an exe's implib output dir for VS, 2009-06-15) and generalized by commit 764ac980 (Generalize exe implib dir creation for VS, 2009-06-16). Create a pre-link rule to make the directory.
* | | | | | | | | | | | Merge topic 'fix-11717-gcov-same-file-name'Brad King2011-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e02a3b CTest: Use the gcov --preserve-paths flag (#11717)
| * | | | | | | | | | | | CTest: Use the gcov --preserve-paths flag (#11717)Marco Craveiro2011-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid name clashes. Before this commit, name clashes can occur when invoking gcov on a project that uses the same file name in different directories. The --preserve-paths flag ensures all file names have a complete path, avoiding name clashes.
* | | | | | | | | | | | | Merge topic 'fix-11761-less-file-download-noise'Brad King2011-02-222-4/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 667cf5b Make file DOWNLOAD less noisy (#11761)
| * | | | | | | | | | | | | Make file DOWNLOAD less noisy (#11761)David Cole2011-02-092-4/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Daniel Nelson for the suggestion and the patch.
* | | | | | | | | | | | | Merge topic 'fix-10704-manifest-no-vs10'Brad King2011-02-224-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbca267 VS: Only use /MANIFEST if hasManifest is true (#11216) 98b448e VS2010: Fixed GenerateManifest flag (#10704)
| * | | | | | | | | | | | | VS: Only use /MANIFEST if hasManifest is true (#11216)David Cole2011-02-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Jörg Riedel for the patch.
| * | | | | | | | | | | | | VS2010: Fixed GenerateManifest flag (#10704)David Cole2011-02-093-1/+20
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to "McBen <viertelvor12@gmx.net>" for the patch. (Did not preserve original commit author information because we have a push check for first and last name, and do not accept authors with only an alias...)
* | | | | | | | | | | | | Merge topic 'fix-4564-make-test-alias'Brad King2011-02-221-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 816c9d1 CTest: Add alias for make test target (#4564)
| * | | | | | | | | | | | | CTest: Add alias for make test target (#4564)David Cole2011-02-011-0/+8
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clients may define CTEST_TEST_TARGET_ALIAS in a project's initial cache to get a target of another name that executes the same underlying command as "make test"
* | | | | | | | | | | | | Merge topic 'fix-10723-non-dev-xcode'Brad King2011-02-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d421a43 Strip trailing space from xcode-select output (#10723)
| * | | | | | | | | | | | | Strip trailing space from xcode-select output (#10723)David Cole2011-02-011-1/+2
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, subsequent use of the output does not work as intended.
* | | | | | | | | | | | | Merge topic 'mpif77-workaround-o-c-order'Brad King2011-02-221-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93f230e Pass -o after -c for Fortran to avoid mpif77 ordering bug
| * | | | | | | | | | | | | Pass -o after -c for Fortran to avoid mpif77 ordering bugBrad King2011-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running $ mpif77 -c example.f -o example.f.o mpif77 recognizes -o and produces example.f.o, but when running $ mpif77 -o example.f.o -c example.f the -o option is ignored and the object file is example.o. Performing the same experiment on the underlying compiler tool or with the mpicc and mpiCC wrappers does not exhibit this behavior, so the issue appears to be specific to mpif77. Reported-by: Zhen Wang <zwang26@emory.edu>
* | | | | | | | | | | | | | Merge topic 'qtdialog-groupingbug'Brad King2011-02-222-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1f52b1 Fix grouping bug where "Ungrouped Entries" showed up as a child.
| * | | | | | | | | | | | | | Fix grouping bug where "Ungrouped Entries" showed up as a child.Clinton Stimpson2011-01-282-5/+13
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge topic 'fix-8914-allow-config-types-override'Brad King2011-02-221-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6221ed Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)
| * | | | | | | | | | | | | | | Xcode: Allow override of CMAKE_CONFIGURATION_TYPES (#8914)David Cole2011-01-281-7/+10
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge topic 'fix-10150-mark-timeout-advanced'Brad King2011-02-221-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5e3692 CTest: Mark DART_TESTING_TIMEOUT as advanced (#10150)