Commit Graph

21800 Commits

Author SHA1 Message Date
Gregor Jasny 7ecac703ce Xcode: Add target property to override productType 2016-12-04 00:13:08 +01:00
Kitware Robot c45b767a8c CMake Nightly Date Stamp 2016-12-03 00:01:04 -05:00
Brad King 738a182a90 Merge topic 'cmake-gui-T-help'
dde72ee9 cmake-gui: Clarify help string on toolset selection field
2016-12-02 09:54:37 -05:00
Brad King 46ff507e41 Merge topic 'csharp_compiler_flag_tables'
9b06c226 VS: Add flag tables for C#
2016-12-02 09:54:30 -05:00
Brad King e9bd298a23 Merge topic 'target_project_type'
66bd8a3c cmVisualStudio10TargetGenerator: Prepare to handle C# projects
2016-12-02 09:54:23 -05:00
Brad King f7425c2177 Merge topic 'execute_process-encoding'
2ed473b3 execute_process: Add ENCODING option for Windows child process output
2016-12-02 09:54:09 -05:00
Brad King bd6a269e1a Merge topic 'utf8pipe'
076aef8e Windows: Use UTF-8 for pipes in CMake, CTest and CPack
2016-12-02 09:53:53 -05:00
Kitware Robot ba946930dd CMake Nightly Date Stamp 2016-12-02 00:01:05 -05:00
Brad King dde72ee943 cmake-gui: Clarify help string on toolset selection field
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
2016-12-01 14:27:13 -05:00
Michael Stürmer 9b06c22648 VS: Add flag tables for C#
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.
2016-12-01 16:45:34 +01:00
Michael Stürmer 66bd8a3cf2 cmVisualStudio10TargetGenerator: Prepare to handle C# projects
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
2016-12-01 10:36:43 -05:00
Brad King 7108d4b73d Merge topic 'compile-pdb-default'
a4da6fa7 Ninja,Makefile: Name static library compile PDB files as VS does
2016-12-01 08:51:00 -05:00
Brad King 5e36feebd4 Merge topic 'vs-Zc-inline'
418afd5b VS: Add v140 flag table entries for `-Zc:inline[-]`
315d44f7 VS: Add v141 flag table entry for `-Zc:inline-`
2016-12-01 08:50:46 -05:00
Brad King 23a63d2024 Merge topic 'cmake-server-pad-arguments'
28e891f0 server-mode: Do not ignore the first cacheArgument on configure
2016-12-01 08:50:41 -05:00
Brad King 75f2a1e459 Merge topic 'VS_DEBUGGER_WORKING_DIRECTORY'
163e8018 VS: Add target property VS_DEBUGGER_WORKING_DIRECTORY
2016-12-01 08:50:30 -05:00
Kitware Robot 7b6f6d9e67 CMake Nightly Date Stamp 2016-12-01 00:01:08 -05:00
Brad King 418afd5b2c VS: Add v140 flag table entries for -Zc:inline[-]
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>
2016-11-30 14:20:15 -05:00
Brad King 315d44f773 VS: Add v141 flag table entry for -Zc:inline-
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>
2016-11-30 14:04:02 -05:00
Tobias Hunger 28e891f0c7 server-mode: Do not ignore the first cacheArgument on configure
SetCacheArgs skips the first argument it gets, so add some padding before
calling it.
2016-11-30 13:14:15 -05:00
Michael Stürmer 163e801809 VS: Add target property VS_DEBUGGER_WORKING_DIRECTORY 2016-11-30 11:45:11 -05:00
Brad King a4da6fa71d Ninja,Makefile: Name static library compile PDB files as VS does
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
2016-11-30 10:26:31 -05:00
Brad King db3499df5d CMake 3.7.1 2016-11-30 09:54:05 -05:00
Dāvis Mosāns 2ed473b3b8 execute_process: Add ENCODING option for Windows child process output
Different applications can use different output encodings.
2016-11-30 09:06:51 -05:00
Brad King 29b37dd975 Merge topic 'msbuild-customization'
e3909918 VS: Add option to customize vcxproj user props file
2016-11-30 08:37:37 -05:00
Brad King 2036639b55 Merge topic 'cpack-ifw-options'
88ecfd8b CPackIFW: Add some options
2016-11-30 08:37:30 -05:00
Brad King 32e95a7b24 Merge topic 'end-commands'
67303794 Combine all unexpected commands to a single class
d23a0196 Set the error after argument expansion in end commands
1afbe7d2 Make error message of standalone endwhile command consistent
2016-11-30 08:37:22 -05:00
Brad King 8224545b1d Merge topic 'update-kwsys'
8bced8b1 Merge branch 'upstream-KWSys' into update-kwsys
cd5cff13 KWSys 2016-11-28 (1c7c2139)
2016-11-30 08:37:15 -05:00
Brad King 4288708cba Merge topic 'vs15-rename-generator-for-master'
31e013ae Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master
d639620e VS: Rename VS 15 generator to 'Visual Studio 15 2017'
2016-11-30 08:37:11 -05:00
Kitware Robot 996e5237ca CMake Nightly Date Stamp 2016-11-30 00:01:04 -05:00
Dāvis Mosāns 076aef8e45 Windows: Use UTF-8 for pipes in CMake, CTest and CPack
Applications which process CMake output will need to decode it as UTF-8
instead of console's codepage.
2016-11-30 00:38:48 +02:00
Daniel Pfeifer 67303794f0 Combine all unexpected commands to a single class 2016-11-29 13:53:29 -05:00
Daniel Pfeifer d23a019684 Set the error after argument expansion in end commands
The current code is optimized for rare error cases.  Simplify the code
and remove these optimizations.
2016-11-29 13:53:29 -05:00
Daniel Pfeifer 1afbe7d2cc Make error message of standalone endwhile command consistent
with the error messages of endforeach, endmacro, endfunction, etc.
2016-11-29 13:53:29 -05:00
Brad King 8bced8b18d Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-11-28 (1c7c2139)
2016-11-29 11:49:34 -05:00
Brad King f75d936a04 Merge branch 'vs15-rename-generator' into release 2016-11-29 11:05:29 -05:00
Brad King 31e013ae60 Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master 2016-11-29 10:51:35 -05:00
Roman Wüger d639620e14 VS: Rename VS 15 generator to 'Visual Studio 15 2017'
The final name of this VS version was announced:

 https://blogs.msdn.microsoft.com/visualstudio/2016/11/16/visual-studio-2017-rc/

Add the year to the generator name accordingly.  For convenience, map
the name without the year to the name with the year.
2016-11-29 10:46:36 -05:00
Michael Stürmer e390991846 VS: Add option to customize vcxproj user props file
Add a `VS_USER_PROPS_CXX` target property to set the user props file of
the generated `.vcxproj` file to be something other than the default
`$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`.
2016-11-29 09:31:30 -05:00
Brad King 839cd16396 Merge topic 'vs-default-build-package'
9e3164df VS: Add option to place `PACKAGE` target in solution default build
2016-11-29 08:59:11 -05:00
Brad King 2f7bafd6da Merge topic 'try_compile-honor-CMAKE_WARN_DEPRECATED'
6d604c49 try_compile: Honor CMAKE_WARN_DEPRECATED in test project
2016-11-29 08:59:07 -05:00
Brad King 4838ca14df Merge topic 'initial_cuda_language_support'
4cc601f2 Help: Add release note for CUDA support
7b9131da CUDA: Add tests to verify CUDA compiler works properly.
9cf5b98d CUDA: Prefer environment variables CUDACXX and CUDAHOSTCXX.
a5e806b3 CUDA: Add support for CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY
d038559e CUDA: Add separable compilation support to the makefile generator.
43ce4414 CUDA: Add separable compilation support to the ninja generator.
4b316097 CUDA: Add support for the CUDA_SEPARABLE_COMPILATION target property
ae05fcc6 CUDA: Add LinkLineComputer that computes cuda dlink lines.
115269a8 CUDA: Refactor cmLinkLineComputer to allow for better derived children.
5dec4031 CUDA: Refactor CMakeCUDAInformation to prepare for separable compilation.
5b20d0ab CUDA: C++ compile features now enable cuda c++11 support.
489c52ce CUDA: Use the host compiler for linking CUDA executables and shared libs.
bbaf2434 CUDA: add support for specifying an explicit host compiler.
a92f8d96 CUDA: Enable header dependency scanning.
ec6ce623 CUDA: State that cuda has preprocessor output and can generate assembly.
4f5155f6 CUDA: We now properly perform CUDA compiler identification.
...
2016-11-29 08:59:03 -05:00
Michael Stürmer 9e3164dfa2 VS: Add option to place PACKAGE target in solution default build
Add a `CMAKE_VS_INCLUDE_PACKAGE_TO_DEFAULT_BUILD` variable to control
this behavior.
2016-11-29 08:46:27 -05:00
Kitware Robot 2f7e05fbc2 CMake Nightly Date Stamp 2016-11-29 00:01:04 -05:00
Brad King 4093bd4025 Merge topic 'include-what-you-use'
d0c14dfb avoid including cmStandardIncludes.h
66a70999 iwyu: Fix VisualStudio specific issues
7b4244ac iwyu: Fix more findings
aeff60e4 iwyu: Fix OSX specific issues
2016-11-28 14:24:07 -05:00
Brad King 8a975efc94 Merge topic '16449-revert-xcode-system-includes'
543dcb0a Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
2016-11-28 14:23:21 -05:00
Daniel Pfeifer d0c14dfb36 avoid including cmStandardIncludes.h 2016-11-28 14:06:41 -05:00
Daniel Pfeifer 66a7099993 iwyu: Fix VisualStudio specific issues 2016-11-28 14:06:40 -05:00
Daniel Pfeifer 7b4244aceb iwyu: Fix more findings 2016-11-28 14:06:40 -05:00
Brad King ca7a52fc59 Merge branch '16449-revert-xcode-system-includes' into release 2016-11-28 13:57:56 -05:00
Gregor Jasny 543dcb0ada Revert "Xcode: Obey SYSTEM keyword for includes (#15687)"
Revert commit v3.7.0-rc1~266^2 (Xcode: Obey SYSTEM keyword for includes,
2015-08-31).  It worked for C, C++, and Swift but not for GNU Assembly
files for which Xcode has no property to set flags.

Closes: #16449
2016-11-28 13:42:46 -05:00