summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-CTestTestSerialOrder-parallel-env'Brad King2015-04-221-0/+1
|\ | | | | | | | | 2f4b13b3 Tests: Protect CTestTestSerialOrder from environment (#15524)
| * Tests: Protect CTestTestSerialOrder from environment (#15524)Brad King2015-04-211-0/+1
| | | | | | | | Reported-by: Stephen Kelly <steveire@gmail.com>
* | Merge topic 'doc-ctest-env-formatting'Brad King2015-04-221-2/+4
|\ \ | | | | | | | | | | | | a61e0994 Help: Fix formatting of env var refs in ctest.1 manual
| * | Help: Fix formatting of env var refs in ctest.1 manualBrad King2015-04-221-2/+4
| |/
* | Merge topic 'doc-find_library-file-name'Brad King2015-04-221-0/+6
|\ \ | | | | | | | | | | | | 941e3bd2 Help: Document in find_library how to search for static libraries
| * | Help: Document in find_library how to search for static librariesBrad King2015-04-221-0/+6
| |/ | | | | | | | | This has been implemented since commit v2.6.0~295 (Make find_library test for the library file as named, 2008-02-06). Add the docs.
* | Merge topic 'autogen-no-rcc-stderr'Brad King2015-04-224-24/+52
|\ \ | | | | | | | | | | | | | | | 258ba828 QtAutogen: Process 'rcc --list' stdout and stderr separately (#15523) acd4f01f cmQtAutoGenerators: Split CR stripping out to helper function
| * | QtAutogen: Process 'rcc --list' stdout and stderr separately (#15523)Brad King2015-04-214-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stderr may have warning messages. We should not treat these lines as resource files. However, we must still recognize error message lines for missing resource files that may be generated. Extend the QtAutogen test to cover a generated resource as the only one listed in a .qrc file. This causes 'rcc --list' to print a warning to stderr that we now intend to ignore.
| * | cmQtAutoGenerators: Split CR stripping out to helper functionBrad King2015-04-211-7/+12
| | |
* | | CMake Nightly Date StampKitware Robot2015-04-221-1/+1
| |/ |/|
* | Merge topic 'clean-up-cmMakefile'Brad King2015-04-2174-434/+360
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dc3a67c cmMakefile: Out-of-line the directory methods. 0f3c8cfa cmMakefile: Use method abstraction to access directories. b288a997 cmMakefile: Rename SetStart* directory API to SetCurrent*. 932d53bc cmMakefile: Remove redundant method duplication. 32b8f03a cmMakefile: Port users of GetStart* methods to new names. 54d6a918 cmMakefile: Rename GetCurrent{Output,Binary}Directory. 55d80d0a cmMakefile: Rename GetCurrent{,Source}Directory. b23cf06f cmake: Remove redundant start directories. fcf246ac cmMakefile: Populate Home directories on initialize. 8878bea7 cmake: Initialize Home directories on cmake for find-package mode. 044dc815 Use the Home directories from the cmake class where intended. d67e8f24 cmake: Fix directory used to find the cache 1ea085d1 cmMakefile: Initialize dir definitions early. f034bb2f Remove redundant calls to MakeStartDirectoriesCurrent. 3a68c323 cmMakefile: Fix wrong parameter names.
| * | cmMakefile: Out-of-line the directory methods.Stephen Kelly2015-04-212-37/+35
| | |
| * | cmMakefile: Use method abstraction to access directories.Stephen Kelly2015-04-211-7/+8
| | |
| * | cmMakefile: Rename SetStart* directory API to SetCurrent*.Stephen Kelly2015-04-205-10/+10
| | |
| * | cmMakefile: Remove redundant method duplication.Stephen Kelly2015-04-201-8/+0
| | |
| * | cmMakefile: Port users of GetStart* methods to new names.Stephen Kelly2015-04-2039-142/+146
| | |
| * | cmMakefile: Rename GetCurrent{Output,Binary}Directory.Stephen Kelly2015-04-2039-73/+73
| | | | | | | | | | | | Match names used in CMake code.
| * | cmMakefile: Rename GetCurrent{,Source}Directory.Stephen Kelly2015-04-2031-61/+65
| | | | | | | | | | | | Match the names used in cmake code.
| * | cmake: Remove redundant start directories.Stephen Kelly2015-04-205-69/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | They are maintained as containing the same content as the 'home' directories, but they are never read from. Fix some comments and help strings which confused the two by name. They actually mean what is called CMAKE_SOURCE_DIR in cmake code.
| * | cmMakefile: Populate Home directories on initialize.Stephen Kelly2015-04-202-6/+3
| | |
| * | cmake: Initialize Home directories on cmake for find-package mode.Stephen Kelly2015-04-201-4/+5
| | | | | | | | | | | | | | | The Home directories can be used to initialize cmMakefile directories internally.
| * | Use the Home directories from the cmake class where intended.Stephen Kelly2015-04-202-7/+7
| | |
| * | cmake: Fix directory used to find the cacheStephen Kelly2015-04-201-1/+1
| | | | | | | | | | | | | | | The start and home directories are the same, but the intent of the code here is to use what is currently called the HomeOutput directory.
| * | cmMakefile: Initialize dir definitions early.Stephen Kelly2015-04-202-9/+5
| | |
| * | Remove redundant calls to MakeStartDirectoriesCurrent.Stephen Kelly2015-04-203-3/+0
| | | | | | | | | | | | The SetStart{,Output}Directory methods do what it does.
| * | cmMakefile: Fix wrong parameter names.Stephen Kelly2015-04-202-5/+5
| | |
* | | Merge topic 'disable-cmMakefile-copy'Brad King2015-04-213-49/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | 80909041 cmMakefile: Disable copy constructor. f3af9517 CPack: Don't copy cmMakefile. Just push a scope instead.
| * | | cmMakefile: Disable copy constructor.Stephen Kelly2015-04-202-47/+2
| | | | | | | | | | | | | | | | | | | | It is no longer necessary to be able to copy it. Additionally, this gives us one less reason to copy cmTarget.
| * | | CPack: Don't copy cmMakefile. Just push a scope instead.Stephen Kelly2015-04-201-2/+2
| |/ /
* | | Merge topic 'cpack-deb-component-vars-prepare'Brad King2015-04-212-235/+259
|\ \ \ | | | | | | | | | | | | | | | | c8375e15 CPackDeb: Refactor package variable lookup by generator
| * | | CPackDeb: Refactor package variable lookup by generatorDomen Vrankar2015-04-212-235/+259
| | |/ | |/| | | | | | | | | | | | | | | | | | | Preparation for per component variables. Patch makes sure we know which variables will be set for per component generator and also prevents accidental overflows of variable values between components.
* | | Merge topic 'FindCUDA.cmake/Fix-MakeDirDuringSeparableCompilation'Brad King2015-04-211-0/+2
|\ \ \ | |/ / |/| | | | | | | | 0ed22502 FindCUDA: Create output dir while compiling intermediate link file (#15016)
| * | FindCUDA: Create output dir while compiling intermediate link file (#15016)James Bigler2015-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | During compilation of the intermediate link file, the output directory may not be present in Visual Studio builds. This fix makes sure the output directory exists before generating the output file. Suggested-by: Irwin Zaid
* | | Merge topic 'cmSystemTools-RunSingleCommand-stderr'Brad King2015-04-2123-69/+110
|\ \ \ | | | | | | | | | | | | | | | | 356c26eb cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
| * | | cmSystemTools: Teach RunSingleCommand to separate stdout and stderrBrad King2015-04-2023-69/+110
| | |/ | |/| | | | | | | | | | | | | | | | Extend the RunSingleCommand signature to capture stdout and stderr separately. Allow both to be captured to the same std::string to preserve existing behavior. Update all call sites to do this so that this refactoring does not introduce functional changes.
* | | Merge topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-215-71/+167
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cd953bf7 Help: Add notes for topic 'cpack-rpm-refactored-file-listing' 76080c32 CPackRPM content listing refactor 152e9b32 CPackRPM package content list code move
| * | | Help: Add notes for topic 'cpack-rpm-refactored-file-listing'Brad King2015-04-201-0/+6
| | | |
| * | | CPackRPM content listing refactorDomen Vrankar2015-04-194-30/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring of content list that removes use of find and sed to make listing algorithm more clear and remove external dependencies. Patch also limits man pages handling to locations listed in brp-compress rpm script by default - fixes bug report #14660.
| * | | CPackRPM package content list code moveDomen Vrankar2015-04-191-70/+77
| | | | | | | | | | | | | | | | | | | | Move rpm package content list code to a separate function.
* | | | Merge topic 'ExternalProject-test-refactor'Brad King2015-04-216-58/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 28429270 Tests: Delay RunCMake.ExternalProject case checks
| * | | | Tests: Delay RunCMake.ExternalProject case checksBrad King2015-04-206-58/+63
| | | | | | | | | | | | | | | | | | | | | | | | | Use RunCMake "-check.cmake" scripts to check the generated initial cache file content so that the full generation process is completed.
* | | | | CMake Nightly Date StampKitware Robot2015-04-211-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'clean-up-ReadListFile'Brad King2015-04-2018-143/+106
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05245b42 cmMakefile: Move some preamble out of the Internal method. 6e23a4bd cmMakefile: Remove always-null first parameter to ReadListFile. d21ebcb2 cmMakefile: Swap parameters of calls to ReadListFile. 95a27267 cmMakefile: Extract conditional code to caller. 7d248547 cmMakefile: Remove intermediate variable. 9db15954 cmMakefile: Move condition to the only calling context where it is true. 5d4480a8 cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers. 3a8ac242 cmMakefile: Collapse nested conditional. 5947d9b0 cmMakefile: Convert filenametoread into a std::string. e2d0e0fb cmMakefile: Remove intermediate variable. 3a1ad171 cmMakefile: Combine duplicate condition. f0dae032 cmMakefile: Re-order independent statements. 08da8742 cmMakefile: Split a conditional. 3dc4fe02 cmMakefile: Re-order independent variable setting. e4f8f1f1 cmMakefile: Remove intermediate variable. 2d6121a9 cmMakefile: Remove use of intermediate variable. ...
| * | | | cmMakefile: Move some preamble out of the Internal method.Stephen Kelly2015-04-181-8/+8
| | | | |
| * | | | cmMakefile: Remove always-null first parameter to ReadListFile.Stephen Kelly2015-04-1813-50/+39
| | | | |
| * | | | cmMakefile: Swap parameters of calls to ReadListFile.Stephen Kelly2015-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | The version with a null first parameter is now equivalent.
| * | | | cmMakefile: Extract conditional code to caller.Stephen Kelly2015-04-181-5/+1
| | | | |
| * | | | cmMakefile: Remove intermediate variable.Stephen Kelly2015-04-181-3/+2
| | | | |
| * | | | cmMakefile: Move condition to the only calling context where it is true.Stephen Kelly2015-04-181-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the Internal method with equivalent parameters, passing a null first argument. A duplicate path computation exists inside the external_in condition now, but that is harmless at this point.
| * | | | cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.Stephen Kelly2015-04-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because all external callers of this method pass a null first parameter, this change has no effect for them. This also makes it obvious that the CMAKE_PARENT_LIST_FILE is set to the name of the file being read itself for CMakeLists.txt files, which may not make any sense.
generated by cgit v0.12 at 2024-11-15 01:40:00 (GMT)