Commit Graph

34086 Commits

Author SHA1 Message Date
Brad King
76444957c1 Merge topic 'cpack-rpm-user-file-list-with-multiple-directives'
4e4b786e CPack/RPM CPACK_RPM_USER_FILELIST change release note
a5a6f61b CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
2016-12-05 09:23:26 -05:00
Brad King
f6f42b25c8 Merge topic 'src-COMPILE_FLAGS-genex'
5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
2016-12-05 09:23:22 -05:00
Brad King
8ababa140c Merge topic 'asm-splitting'
dd153de4 CMakeDetermineASMCompiler: arg-split ASM* env var like CC
2016-12-05 09:23:14 -05:00
Kitware Robot
a0adef2bed CMake Nightly Date Stamp 2016-12-05 00:01:05 -05:00
Kitware Robot
4660958875 CMake Nightly Date Stamp 2016-12-04 00:01:03 -05:00
Domen Vrankar
4e4b786e33 CPack/RPM CPACK_RPM_USER_FILELIST change release note 2016-12-03 20:40:29 +01:00
Harry Mallon
a5a6f61be3 CPackRPM now supports multiple directives in CPACK_RPM_USER_FILELIST
* 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.
2016-12-03 20:39:05 +01:00
Daniel Pfeifer
1af67b199a cmCTestTestHandler: use multimap 2016-12-03 14:54:52 +01:00
Kitware Robot
c45b767a8c CMake Nightly Date Stamp 2016-12-03 00:01:04 -05:00
Brad King
027ce359ff FindOpenGL: Provide imported targets for GL and GLU
Create OpenGL::GL and OpenGL::GLU imported targets using the locations
found.

This feature was originally added by commit v3.1.0-rc1~420^2~2
(FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31) but
had to be reverted by commit v3.1.0-rc3~10^2 (FindOpenGL: Revert support
for imported targets, 2014-12-01) due to issue #15267.  Since then we
added support for `IMPORTED_LIBNAME` to interface libraries, so use it
to handle the case where we have only the library name without an
absolute path.

Inspired-by: Philipp Möller <bootsarehax@googlemail.com>
Closes: #15267
2016-12-02 15:11:49 -05:00
Brad King
97c1e56924 Help: Add release note for C++ 17 support
Closes: #16468
2016-12-02 11:22:47 -05:00
Brad King
85c8e652b1 Features: Activate C++ 17 support for AppleClang 6.1+ 2016-12-02 11:22:47 -05:00
Brad King
8084f7a6c9 Features: Activate C++ 17 support for Clang 3.5+ 2016-12-02 11:22:46 -05:00
Brad King
24e29d4190 Features: Activate C++ 17 support for GNU 5.1+ 2016-12-02 11:22:46 -05:00
Brad King
ae1a6815b6 Features: Add infrastructure for C++ 17 language standard
Issue: #16468
2016-12-02 11:22:46 -05:00
Brad King
684e4d205d Features: Make feature recording conditions more consistent
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).
2016-12-02 11:22:43 -05:00
Tobias Hunger
5dec0a2328 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
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.
2016-12-02 10:15:50 -05:00
Michał Górny
dd153de4f0 CMakeDetermineASMCompiler: arg-split ASM* env var like CC
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}`.
2016-12-02 10:00:34 -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
6d979ecf26 Merge topic 'packaging-qtsdk'
6eb78af2 QtIFW: Packaging as part of the QtSDK
2016-12-02 09:54:34 -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
debeb07a40 Merge branch 'release' 2016-12-01 08:51:52 -05:00
Brad King
a178a0d7a6 Merge topic 'cmake-ifw-root-component'
d07d24b8 QtIFW: Configurable root component
2016-12-01 08:51:03 -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
36588f7b16 Merge topic 'pgi-macos-flags'
571721c5 PGI: Pass macOS-specific link flags directly to linker
2016-12-01 08:50:55 -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
0d89c1e87c Merge branch 'vs-Zc-inline' into release 2016-11-30 14:30:41 -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
Konstantin Podsvirov
6eb78af2ba QtIFW: Packaging as part of the QtSDK
Usage: 'cmake ... -C Packaging/QtSDK/ToolsCMakeXX.cmake ...' to make
compatible package.
2016-11-30 21:57:35 +03:00
Brad King
571721c562 PGI: Pass macOS-specific link flags directly to linker
The PGI compiler on macOS does not support some macOS-specific flags so
pass them through `-Wl,` to the linker directly.

Issue: #16457
2016-11-30 13:34:50 -05:00
Brad King
d69cf34708 Merge branch 'cmake-server-pad-arguments' into release 2016-11-30 13:14:52 -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
f2035cbd0d Merge branch 'release' 2016-11-30 11:17:34 -05:00
Konstantin Podsvirov
d07d24b8a3 QtIFW: Configurable root component 2016-11-30 18:36:06 +03: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
afe7d5f26d Merge branch 'release' 2016-11-30 08:38:58 -05:00