summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Add flag to result and manipulate in place.Stephen Kelly2015-02-181-5/+5
| | | | | Rather than creating a string, manipulating it, and then copying it to the result.
* cmMakefile: Replace two loops with std::replace.Stephen Kelly2015-02-181-13/+2
|
* cmMakefile: Replace loop with composed algorithm.Stephen Kelly2015-02-181-12/+5
|
* cmCTest: Convert loop to member insert.Stephen Kelly2015-02-181-4/+3
|
* Merge topic 'minor-cleanups'Brad King2015-02-1812-71/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6652afe6 CTest: Use clear instead of erase-all. 75661fdf cmListCommand: Move size variable out of loop. 10e53e23 cmAlgorithms: Add missing const to functors. 74906322 cmAlgorithms: Remove sort of already-sorted container. 2acd04c9 cmcmd: Remove some comment copy-pasta. 2d833232 cmCoreTryCompile: Remove variable assignment. 26602cf5 cmLocalGenerator: Move variable population inside of condition. cfb84834 Update comment to match recent dashboard testing. 6010f936 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector" 0550b9e3 Revert "Attempt to fix the compile of cmake on Sun CC." 1ee4721f Help: Fix formatting of command parameter. 62429a1e cmGlobalGenerator: Remove unneeded pointer check. c697c1fa cmTarget: Remove template argument workaround.
| * CTest: Use clear instead of erase-all.Stephen Kelly2015-02-171-2/+1
| |
| * cmListCommand: Move size variable out of loop.Stephen Kelly2015-02-171-6/+6
| | | | | | | | Re-use it where possible in two instances.
| * cmAlgorithms: Add missing const to functors.Stephen Kelly2015-02-171-3/+3
| |
| * cmAlgorithms: Remove sort of already-sorted container.Stephen Kelly2015-02-171-1/+0
| | | | | | | | The indices is populated by an increasing number.
| * cmcmd: Remove some comment copy-pasta.Stephen Kelly2015-02-171-4/+0
| |
| * cmCoreTryCompile: Remove variable assignment.Stephen Kelly2015-02-171-2/+1
| | | | | | | | | | The variable is not a reference, and we return in the same scope after assigning, so it has no effect.
| * cmLocalGenerator: Move variable population inside of condition.Stephen Kelly2015-02-171-4/+3
| | | | | | | | | | It is only used in the condition, so no need to look for uses elsewhere when reading the code.
| * Update comment to match recent dashboard testing.Stephen Kelly2015-02-171-1/+1
| |
| * Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"Stephen Kelly2015-02-171-1/+1
| | | | | | | | | | | | | | This reverts commit ae6fc555a7e8929f6d96545bd1137c8bd378566d. Use the more-natural make_pair algorithm. The compiler motivating the need for this is not supported as a host anymore.
| * Revert "Attempt to fix the compile of cmake on Sun CC."Stephen Kelly2015-02-171-4/+1
| | | | | | | | | | | | This reverts commit a573a856581118d7a9d8dd7be1f613ba7b1ddb04. The workaround is not needed on supported SolarisStudio compilers.
| * Help: Fix formatting of command parameter.Stephen Kelly2015-02-171-1/+1
| |
| * cmGlobalGenerator: Remove unneeded pointer check.Stephen Kelly2015-02-171-5/+1
| | | | | | | | Deleting nullptr is ok.
| * cmTarget: Remove template argument workaround.Stephen Kelly2015-02-172-37/+5
| | | | | | | | | | | | Pre-C++98 compilers required that the template argument be used in the function parameters. Those compilers are no longer supported as hosts, so drop the workaround.
* | CMake Nightly Date StampKitware Robot2015-02-181-1/+1
|/
* Merge topic 'vs7-OutputDirectory'Brad King2015-02-174-9/+30
|\ | | | | | | | | | | fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
| * VS: Fix .vcproj and .vfproj file OutputDirectory generationBrad King2015-02-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmLocalVisualStudio7Generator to set 'OutputDirectory' using the same method as is used to set the 'OutputFile' in the generated project file. Also, OutputDirectory only needs to be set for targets that run the linker or librarian. These two changes make the VS 7 OutputDirectory consistent with what cmVisualStudio10TargetGenerator generates for OutDir. Without this, since the VS Intel Fortran plugin for VS >= 10 still uses the VS 7 .vfproj file format, when executing test VSGNUFortran using Intel Fortran Compiler 15.xx, the following warning is issued just before compilation: TargetPath(...) does not match the Linker's OutputFile property value (...). This may cause your project to build incorrectly. To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt) property values match the value specified in %(Link.OutputFile). Subsequently, an error is reported during linking. Inspired-by: Vincent Newsum <vynewsum@gmail.com>
| * VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9Brad King2015-02-164-7/+19
| | | | | | | | | | | | | | | | | | This will allow us to use a value other than just the config name for the project OutputDirectory setting used for $(OutDir). Also use $(ConfigurationName) instead of $(OutDir) for the link directory configuration suffix since that is a hard-coded instance of a use case for CMAKE_CFG_INTDIR.
* | CMake Nightly Date StampKitware Robot2015-02-171-1/+1
|/
* Merge topic 'cmListCommand-algorithms'Brad King2015-02-162-88/+123
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 116459d3 cmListCommand: Avoid needlessly erasing from vectors. 1c7c35c3 cmListCommand: Replace remove duplicates loop with algorithm. cebeed24 cmAlgorithms: Add cmRemoveDuplicates algorithm. 3cfe7a4c cmListCommand: Implement REMOVE_ITEM in terms of cmRemoveMatching. 050958a3 cmAlgorithms: Add cmRemoveMatching algorithm. a77af8f1 cmListCommand: Replace joining loop with cmJoin algorithm. 6a22e401 cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand. 0b5cf0da cmAlgorithms: Implement algorithm for removing indexes. 069f2440 cmListCommand: Convert loop to find algorithm. 67a26764 cmListCommand: Implement REVERSE subcommand with std::reverse. 1cecd3a5 cmListCommand: Use std::find algorithm for FIND subcommand.
| * cmListCommand: Avoid needlessly erasing from vectors.Stephen Kelly2015-02-151-17/+21
| | | | | | | | | | | | The entire vector will be destroyed at once at the end of the scope, and the remove algorithms already give us the end of the range of interesting values, so just use those sentinals.
| * cmListCommand: Replace remove duplicates loop with algorithm.Stephen Kelly2015-02-151-18/+3
| |
| * cmAlgorithms: Add cmRemoveDuplicates algorithm.Stephen Kelly2015-02-151-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start by creating a vector to hold a unique values of the input range. We expect that in most cases, there will be relatively few duplicates, so reserving enough memory for a complete copy is worthwhile. Unlike a solution involving a std::set, this algorithm allocates all the memory it needs in one go and in one place, so it is more cache friendly. Populate the unique copy with a lower_bound insert algorithm and record the indices of duplicates. This is the same complexity as the std::set insert algorithm, but without the need to allocate memory on the heap and other disadvantages of std::set. Remove the duplicates with the cmRemoveIndices algorithm.
| * cmListCommand: Implement REMOVE_ITEM in terms of cmRemoveMatching.Stephen Kelly2015-02-151-16/+6
| |
| * cmAlgorithms: Add cmRemoveMatching algorithm.Stephen Kelly2015-02-151-0/+24
| | | | | | | | | | Implement it in terms of std::remove_if with a binary search through a matching range.
| * cmListCommand: Replace joining loop with cmJoin algorithm.Stephen Kelly2015-02-151-8/+2
| |
| * cmListCommand: Use cmRemoveIndices for REMOVE_AT subcommand.Stephen Kelly2015-02-151-16/+9
| | | | | | | | | | Avoid repeatedly looping over the indices to process elements (even without breaking out of the loop when the element is found).
| * cmAlgorithms: Implement algorithm for removing indexes.Stephen Kelly2015-02-151-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement ContainerAlgorithms::RemoveN to remove N elements to the end of a container by rotating. The rotate is implemented in terms of the efficient swap algorithm, optimized even more in the standard library implementation when the compiler supports the rvalue-references feature to move elements. Implement cmRemoveN with a Range API for completeness. std::rotate in C++11 is specified to return an iterator, but c++98 specifies it to return void. libstdc++ 5.0 will be the first version to have the correct return type. Implement ContainerAlgorithms::Rotate in terms of std::rotate and return the correct iterator from it. While std::rotate requires forward iterators, this workaround means cmRotate requires bidirectional iterators. As most of CMake uses random access iterators anyway, this should not be a problem. Implement cmRemoveIndices in terms of the RemoveN algorithm, such that each element which is not removed is rotated only once. This can not use the cmRemoveN range-API algorithm because that would require creating a new range, but the range must be taken by reference and so it can't be a temporary. These remove algorithms are not part of the STL and I couldn't find them anywhere else either.
| * cmListCommand: Convert loop to find algorithm.Stephen Kelly2015-02-151-12/+1
| |
| * cmListCommand: Implement REVERSE subcommand with std::reverse.Stephen Kelly2015-02-151-9/+2
| |
| * cmListCommand: Use std::find algorithm for FIND subcommand.Stephen Kelly2015-02-151-11/+7
| | | | | | | | | | | | Use a ostringstream to account for the input being a variable of type size_t as a result of using std::distance. There is no single format string which portably accepts a size_t.
* | Merge topic 'test-rpmbuild-cleanup'Brad King2015-02-162-11/+16
|\ \ | | | | | | | | | | | | d891d474 Tests: Consolidate detection of 'rpmbuild'
| * | Tests: Consolidate detection of 'rpmbuild'Brad King2015-02-132-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Several tests use slight variations of the same logic to enable CPack RPM tests. Consolidate this logic into one check before any tests are added. Look for 'rpmbuild' only on Linux and only when the test build tree does not have spaces in the path. In particular, this will make the result available in time for the RunCMake.CPackRPM test to be activated even if CMake is configured exactly once.
* | | Merge topic 'wix-product-fragment'Brad King2015-02-164-3/+21
|\ \ \ | | | | | | | | | | | | | | | | a2ccbffd CPackWIX: Extend the patching mechanism to allow adding content to <Product>.
| * | | CPackWIX: Extend the patching mechanism to allow adding content to <Product>.Nils Gladitz2015-02-134-3/+21
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-02-161-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-02-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-02-141-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2015-02-130-0/+0
|\ \ \
| * \ \ Merge branch 'doc-3.2-relnotes-fixup' into releaseBrad King2015-02-131-6/+6
| |\ \ \
| * \ \ \ Merge branch 'doc-configure_file-output-location' into releaseBrad King2015-02-121-30/+95
| |\ \ \ \
* | \ \ \ \ Merge topic 'doc-3.2-relnotes-fixup'Brad King2015-02-131-6/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | 6d19ef9b Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section
| * | | | Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed sectionBrad King2015-02-131-6/+6
| | | | | | | | | | | | | | | | | | | | It is a possibly incompatible change.
* | | | | Merge topic 'doc-configure_file-output-location'Brad King2015-02-131-30/+95
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | 029d38fa Help: Revise configure_file documentation (#15403)
| * | | | Help: Revise configure_file documentation (#15403)Brad King2015-02-121-30/+95
| |/ / / | | | | | | | | | | | | | | | | | | | | Format the documentation with better reST markup. Revise the wording to clarify how relative paths are handled. Also add an example section.
* | | | Merge topic 'clean-up-cmFunctionCommand'Brad King2015-02-131-21/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78757e7f cmFunctionCommand: Replace loops with cmJoin. fc1cf265 cmFunctionCommand: Remove counting variable. e5ebeae7 cmFunctionCommand: Split loop in two.