summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Simplify multiple config handling.Stephen Kelly2014-04-023-29/+20
| | | | | Use conventional pattern of not repeating the loop body for empty config.
* Merge topic 'simplify-ninja-linker-command'Brad King2014-04-011-51/+29
|\ | | | | | | | | 2b896752 Ninja: Simplify code for linker commands
| * Ninja: Simplify code for linker commandsJiri Malak2014-04-011-51/+29
| | | | | | | | | | Use GetCreateRuleVariable function instead of redundant code for Rule variable name. Use temporary variables to improve code.
* | Merge topic 'fix_policy_diagnostics'Brad King2014-04-018-28/+34
|\ \ | | | | | | | | | | | | 77b581c2 Policies: omit warnings about unset policies when they are actually set to NEW
| * | Policies: omit warnings about unset policies when they are actually set to NEWNils Gladitz2014-03-318-28/+34
| | |
* | | Merge topic 'clang-warnings'Brad King2014-04-012-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8c9c4fe1 Remove 'return' statements that can never be reached 50ca77f4 create_test_sourcelist: Initialize variable at declaration
| * | | Remove 'return' statements that can never be reachedSean McBride2014-03-312-2/+0
| |/ / | | | | | | | | | Clang -Wunreachable-code-return warns otherwise.
| * | CMake 3.0.0-rc3v3.0.0-rc3Brad King2014-03-201-1/+1
| | |
* | | Merge topic 'cmake-gui-symlinks'Brad King2014-04-012-4/+8
|\ \ \ | | | | | | | | | | | | | | | | 480be00b cmake-gui: Don't resolve symlinks with using file dialog.
| * | | cmake-gui: Don't resolve symlinks with using file dialog.Clinton Stimpson2014-03-302-4/+8
| | | | | | | | | | | | | | | | | | | | This fixes bug #14274 where a clang++ symlink was resolved to a clang executable.
* | | | Merge topic 'link-line-quoting'Brad King2014-04-017-67/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 423009c1 Makefile: Generate single-quoted object lists for Watcom a863a8fe cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPath
| * | | | Makefile: Generate single-quoted object lists for WatcomJiri Malak2014-03-277-36/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the CMAKE_NO_QUOTED_OBJECTS internal variable from the Makefile generators. The underlying problem is with the Watcom linker, not with WMake. The Watcom linker wants object files to be single-quoted. Add <LINK-RULE>_USE_WATCOM_QUOTE platform information variables to tell the generators to use Watcom-style single quotes for object files on link lines. On Windows, Watcom uses the GetCommandLine API to get the original command-line string and do custom parsing that expects single quotes. On POSIX systems, Watcom approximates the original command line by joining all argv[] entries separated by a single space. Therefore we need to double-quote the single-quoted arguments so that the shell does not consume them and they are available for the parser to see.
| * | | | cmLocalUnixMakefileGenerator3: Re-organize ConvertToQuotedOutputPathJiri Malak2014-03-271-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | Use one code path whether the components list is empty or not. Fix indentation accordingly.
* | | | | CMake Nightly Date StampKitware Robot2014-04-011-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-03-311-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-301-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-291-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-281-1/+1
| |/ / |/| |
* | | Merge topic 'osx-CFBundle-info-plist'Brad King2014-03-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 90e22f8f OS X: Fix Info.plist placement in a CFBundle
| * | | OS X: Fix Info.plist placement in a CFBundleTim Blechmann2014-03-261-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Fix cmOSXBundleGenerator::CreateCFBundle to place Info.plist under the same root directory as the rest of the bundle. Without this, Info.plist was placed into CMAKE_BINARY_DIR, not CMAKE_CURRENT_BINARY_DIR because the target path was not generated correctly.
* | | CMake Nightly Date StampKitware Robot2014-03-271-1/+1
| | |
* | | Merge topic 'fix-Qt-Autogen'Brad King2014-03-262-5/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | 71a11252 QtAutogen: Fix use of multiple ui files in a single target. 261acd91 QtAutogen: Use the basename for resource files.
| * | | QtAutogen: Fix use of multiple ui files in a single target.Stephen Kelly2014-03-252-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Don't store a mapping of the directory to the ui file. The directory will be a unique key, allowing only one ui file to be specified. Use the source file name instead as the mapping key.
| * | | QtAutogen: Use the basename for resource files.Stephen Kelly2014-03-251-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | The rcc tool generates a cpp file with a symbol called qInitResources or called qInitResources_${name}, if the name is passed. The qInitResources symbol clashes if multiple qrc files are used in one target. Always pass the name to ensure that the symbol is unique. This is also the behavior of the qtx_add_resource macros.
| * | Merge branch 'add_custom_command-no-INTERFACE-lib' into releaseBrad King2014-03-192-1/+10
| |\ \
* | \ \ Merge topic 'dev/custom-ninja-deptypes'Brad King2014-03-261-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9523d2a5 ninja: Add support for custom depfile formats
| * | | | ninja: Add support for custom depfile formatsBen Boeckel2014-03-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not everything that isn't MSVC is GCC. I have support for LDC's depfile format on its way upstream[1], but its future is uncertain. CMake should at least support this for future depfile formats. [1]https://github.com/martine/ninja/pull/721
* | | | | Merge topic 'remove-CMakeFiles-advice'Brad King2014-03-261-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bccc056b cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)
| * | | | | cmake: Advise user to remove CMakeFiles with CMakeCache.txt (#14820)Brad King2014-03-211-4/+4
| | | | | |
* | | | | | Merge topic 'haiku-updates'Brad King2014-03-262-0/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0cc42b87 Haiku: Fix compiler detection when using distcc 84603d80 Haiku: Enable CMake builtin ELF editor
| * | | | | | Haiku: Enable CMake builtin ELF editorAdrien Destugues2014-03-212-0/+38
| |/ / / / / | | | | | | | | | | | | | | | | | | Co-Author: Brad King <brad.king@kitware.com>
* | | | | | Merge topic 'report-INTERFACE-type-in-conflict'Brad King2014-03-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
| * | | | | | cmMakefile: Report type of INTERFACE library in conflict.Stephen Kelly2014-03-201-0/+3
| |/ / / / /
* | | | | | Merge topic 'update-kwsys'Brad King2014-03-261-4/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | ed6ddb89 Merge branch 'upstream-kwsys' into update-kwsys 12faf00d KWSys 2014-03-19 (a8aa1014)
| * | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-03-201-4/+9
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2014-03-261-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-03-241-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-03-231-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-03-211-1/+1
|/ / /
* | | Merge topic 'watcom-updates'Brad King2014-03-205-5/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64c2342a Watcom: Enable 'WMake Makefiles' generator on Linux 5d9aa66c Watcom: Introduce OpenWatcom compiler id and fix compiler version 9292d3b8 Watcom: Detect compiler target architecture and platform fbc883c9 Watcom: Add one blank line to Makefile for better readability
| * | | Watcom: Enable 'WMake Makefiles' generator on LinuxJiri Malak2014-03-173-4/+20
| | | |
| * | | Watcom: Introduce OpenWatcom compiler id and fix compiler versionJiri Malak2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Distinguish "Open Watcom" from old "Watcom" by introducing a new "OpenWatcom" compiler id. The __WATCOMC__ format is "VVRP" for Watcom and "VVRP + 1100" for Open Watcom.
| * | | Watcom: Add one blank line to Makefile for better readabilityJiri Malak2014-03-171-0/+1
| | | |
* | | | Merge topic 'configure_file-unicode'Brad King2014-03-201-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 98383f80 Unicode: check encoding of files given to configure_file.
| * | | | Unicode: check encoding of files given to configure_file.Clinton Stimpson2014-03-171-0/+14
| | | | | | | | | | | | | | | | | | | | UTF-16 and UTF-32 files are rejected.
* | | | | Merge topic 'file-DOWNLOAD-cap-progress'Brad King2014-03-201-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 413282c0 file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)
| * | | | | file: Avoid runaway DOWNLOAD/UPLOAD progress reports (#14807)Brad King2014-03-171-0/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Curl makes progress callbacks frequently but we round to the nearest percent and report only when that changes so that we make at most 101 progress reports. However, when unexpected data beyond the total are transferred the progress can get beyond 100% and lead to unlimited reports. Avoid this case by capping the reported progress to 100%.
* | | | | Merge topic 'minor_cleanups'Brad King2014-03-206-40/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19012b46 cmMakefile: Fix style. 10e6f1e7 cmMakefile: Fix typo in comment. c3a2f78b Makefiles: Remove duplicate code. 2e0611f9 cmGeneratorExpression: Remove unused include. d83ef53a Rename local 'dir_max' variables to 'dir'