summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2016-12-05106-1518/+2087
|\ | | | | | | | | * upstream-curl: curl 2016-11-02 (3c561c65)
| * curl 2016-11-02 (3c561c65)Curl Upstream2016-12-05106-1520/+2096
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 3c561c657c2f0e553b19115a506592a8bbd744bc (curl-7_51_0).
* | curl: Update script to get curl 7.51.0Brad King2016-12-051-1/+1
| |
* | Merge topic 'features-c++17'Brad King2016-12-0523-29/+109
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 97c1e569 Help: Add release note for C++ 17 support 85c8e652 Features: Activate C++ 17 support for AppleClang 6.1+ 8084f7a6 Features: Activate C++ 17 support for Clang 3.5+ 24e29d41 Features: Activate C++ 17 support for GNU 5.1+ ae1a6815 Features: Add infrastructure for C++ 17 language standard 684e4d20 Features: Make feature recording conditions more consistent
| * | Help: Add release note for C++ 17 supportBrad King2016-12-021-0/+6
| | | | | | | | | | | | Closes: #16468
| * | Features: Activate C++ 17 support for AppleClang 6.1+Brad King2016-12-021-0/+8
| | |
| * | Features: Activate C++ 17 support for Clang 3.5+Brad King2016-12-021-0/+8
| | |
| * | Features: Activate C++ 17 support for GNU 5.1+Brad King2016-12-021-0/+8
| | |
| * | Features: Add infrastructure for C++ 17 language standardBrad King2016-12-0213-13/+55
| | | | | | | | | | | | Issue: #16468
| * | Features: Make feature recording conditions more consistentBrad King2016-12-029-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Condition all calls to `_record_compiler_features_{c,cxx}` on `_result EQUAL 0` so that adding new language standards later does not need to update them. Avoid some duplicate compiler version checks by conditioning C11 and CXX14 feature recording on the existence of `CMAKE_{C11,CXX14}_STANDARD_COMPILE_OPTION` (whose setting already used the version check).
* | | Merge topic 'test-handler-multimap'Brad King2016-12-051-27/+20
|\ \ \ | | | | | | | | | | | | | | | | 1af67b19 cmCTestTestHandler: use multimap
| * | | cmCTestTestHandler: use multimapDaniel Pfeifer2016-12-031-27/+20
| | | |
* | | | Merge topic 'cpack-rpm-user-file-list-with-multiple-directives'Brad King2016-12-056-5/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note a5a6f61b CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
| * | | | CPack/RPM CPACK_RPM_USER_FILELIST change release noteDomen Vrankar2016-12-031-0/+6
| | | | |
| * | | | CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELISTHarry Mallon2016-12-035-5/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * In older version "%dir %attr(-, root, root) foo" would put "%dir foo" in the final spec file. * Also added comment to describe this and advise not not to add trailing slashes to directories in USER_FILELIST. * Includes test in RunCMake CPack which now passes.
* | | | Merge topic 'src-COMPILE_FLAGS-genex'Brad King2016-12-051-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
| * | | | server-mode: Fix per-source COMPILE_FLAGS genex evaluationTobias Hunger2016-12-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic added by commit 1e4bb358 (Add generator expression support to per-source COMPILE_FLAGS, 2016-10-25) accidentally frees memory before finishing with it. Revise the logic to hold the memory long enough.
* | | | | Merge topic 'asm-splitting'Brad King2016-12-051-1/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd153de4 CMakeDetermineASMCompiler: arg-split ASM* env var like CC
| * | | | | CMakeDetermineASMCompiler: arg-split ASM* env var like CCMichał Górny2016-12-021-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split the arguments off of the `ASM${ASM_DIALECT}` environment variable as is done for `CC` and other compiler variables. This fixes using CMake when `ASM*` is used to pass additional target flags, e.g. when one uses `ASM=${CC}`.
* | | | | | CMake Nightly Date StampKitware Robot2016-12-051-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-12-041-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2016-12-031-1/+1
| | | | |
* | | | | Merge topic 'cmake-gui-T-help'Brad King2016-12-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dde72ee9 cmake-gui: Clarify help string on toolset selection field
| * | | | | cmake-gui: Clarify help string on toolset selection fieldBrad King2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text `-T parameter` may be read as an example value for the field, but the `-T` part should not be included. Clarify the wording. Closes: #16475
* | | | | | Merge topic 'packaging-qtsdk'Brad King2016-12-022-0/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6eb78af2 QtIFW: Packaging as part of the QtSDK
| * | | | | | QtIFW: Packaging as part of the QtSDKKonstantin Podsvirov2016-11-302-0/+116
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Usage: 'cmake ... -C Packaging/QtSDK/ToolsCMakeXX.cmake ...' to make compatible package.
* | | | | | Merge topic 'csharp_compiler_flag_tables'Brad King2016-12-0213-0/+648
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b06c226 VS: Add flag tables for C#
| * | | | | | VS: Add flag tables for C#Michael Stürmer2016-12-0113-0/+648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add these (currently unused) tables in preparation for `.csproj` generation support. Populate the tables for every version with a set of initial values that work well for me with VS 12 and VS 14. Later we may need to generate them more thoroughly from MSBuild `.xml` files.
* | | | | | | Merge topic 'target_project_type'Brad King2016-12-022-8/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66bd8a3c cmVisualStudio10TargetGenerator: Prepare to handle C# projects
| * | | | | | | cmVisualStudio10TargetGenerator: Prepare to handle C# projectsMichael Stürmer2016-12-012-8/+50
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generalize some internal infrastructure to prepare for generating either `.vcxproj` or `.csproj` files. - Add member string for project file extension - Add member enum for project type - Add member flag for in-source build - Add member flag for managed build - Rename PathToVcxproj to PathToProjectFile
* | | | | | | Merge topic 'execute_process-encoding'Brad King2016-12-0216-2/+125
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ed473b3 execute_process: Add ENCODING option for Windows child process output
| * | | | | | | execute_process: Add ENCODING option for Windows child process outputDāvis Mosāns2016-11-3016-2/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Different applications can use different output encodings.
* | | | | | | | Merge topic 'utf8pipe'Brad King2016-12-024-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | 076aef8e Windows: Use UTF-8 for pipes in CMake, CTest and CPack
| * | | | | | Windows: Use UTF-8 for pipes in CMake, CTest and CPackDāvis Mosāns2016-11-294-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applications which process CMake output will need to decode it as UTF-8 instead of console's codepage.
* | | | | | | CMake Nightly Date StampKitware Robot2016-12-021-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2016-12-010-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'vs-Zc-inline' into releaseBrad King2016-11-302-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'cmake-server-pad-arguments' into releaseBrad King2016-11-301-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cmake-ifw-root-component'Brad King2016-12-012-42/+92
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d07d24b8 QtIFW: Configurable root component
| * | | | | | | | | QtIFW: Configurable root componentKonstantin Podsvirov2016-11-302-42/+92
| | | | | | | | | |
* | | | | | | | | | Merge topic 'compile-pdb-default'Brad King2016-12-012-0/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4da6fa7 Ninja,Makefile: Name static library compile PDB files as VS does
| * | | | | | | | | | Ninja,Makefile: Name static library compile PDB files as VS doesBrad King2016-11-302-0/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default compile PDB file name for static libraries to match the Visual Studio default of using the logical target name. This may be incompatible with existing behavior but `COMPILE_PDB_NAME` documents that the default is unspecified. Projects depending on a particular name should set the property. Closes: #16438
* | | | | | | | | | Merge topic 'pgi-macos-flags'Brad King2016-12-014-0/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 571721c5 PGI: Pass macOS-specific link flags directly to linker
| * | | | | | | | | | PGI: Pass macOS-specific link flags directly to linkerBrad King2016-11-304-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PGI compiler on macOS does not support some macOS-specific flags so pass them through `-Wl,` to the linker directly. Issue: #16457
* | | | | | | | | | | Merge topic 'vs-Zc-inline'Brad King2016-12-012-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 418afd5b VS: Add v140 flag table entries for `-Zc:inline[-]` 315d44f7 VS: Add v141 flag table entry for `-Zc:inline-`
| * | | | | | | | | | VS: Add v140 flag table entries for `-Zc:inline[-]`Brad King2016-11-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation of this option [1] claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file. Add the flag table entry to allow use of the flag to be configured. [1] https://msdn.microsoft.com/en-us/library/dn642448.aspx Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
| * | | | | | | | | | VS: Add v141 flag table entry for `-Zc:inline-`Brad King2016-11-301-0/+1
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The negative form of the `-Zc:inline` flag is missing from c:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE/VC/VCTargets/1033/cl.xml so it was not included in our flag table automatically. Add it manually. Suggested-by: Serti Ayoub <ayb.serti@gmail.com>
* | | | | | | | | | Merge topic 'cmake-server-pad-arguments'Brad King2016-12-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 28e891f0 server-mode: Do not ignore the first cacheArgument on configure
| * | | | | | | | | server-mode: Do not ignore the first cacheArgument on configureTobias Hunger2016-11-301-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SetCacheArgs skips the first argument it gets, so add some padding before calling it.
* | | | | | | | | Merge topic 'VS_DEBUGGER_WORKING_DIRECTORY'Brad King2016-12-017-0/+49
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 163e8018 VS: Add target property VS_DEBUGGER_WORKING_DIRECTORY