Commit Graph

34057 Commits

Author SHA1 Message Date
Sebastian Holtermann
9eba41479b QtAutogen: Rcc related function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
693d85f8d6 QtAutogen: Rcc related list function rename 2016-12-06 15:59:25 +01:00
Sebastian Holtermann
43747ee8b3 QtAutogen: Rcc related setup function rename 2016-12-06 15:59:24 +01:00
Sebastian Holtermann
8de8d3b191 QtAutogen: Remove and inline ReadAll function
The function was only used once.
2016-12-06 15:59:24 +01:00
Sebastian Holtermann
d0283dc185 QtAutogen: Use shorter name for static function 2016-12-06 15:59:24 +01:00
Sebastian Holtermann
2c9667e897 QtAutogen: Use util prefix for static function name 2016-12-06 15:59:24 +01:00
Brad King
0f37cd228e Merge topic 'FindOpenGL-imported-targets'
027ce359 FindOpenGL: Provide imported targets for GL and GLU
2016-12-06 09:26:25 -05:00
Brad King
0290bfc35d Merge topic 'update-curl'
df7fa47c curl: Disable symbol hiding logic in build for CMake
f8a1ba20 Merge branch 'upstream-curl' into update-curl
93cc249f curl 2016-11-02 (3c561c65)
25d7b1ca curl: Update script to get curl 7.51.0
2016-12-06 09:26:20 -05:00
Brad King
22f05b1d8c Merge topic 'update-kwsys'
7f307d9e Merge branch 'upstream-KWSys' into update-kwsys
1b50bd3f KWSys 2016-12-02 (4967ccc0)
2016-12-06 09:26:17 -05:00
Brad King
9cf5fe22d0 Merge topic 'wix-reg-install-dir'
4beaa926 Help: Add notes for topic 'wix-reg-install-dir'
1b91e010 Utilities/Release: Store WiX CMake install location in Windows registry
2016-12-06 09:26:12 -05:00
Brad King
4beaa926b3 Help: Add notes for topic 'wix-reg-install-dir' 2016-12-06 09:25:00 -05:00
Brad King
df7fa47c1b curl: Disable symbol hiding logic in build for CMake
We already disable the code using `HIDES_CURL_PRIVATE_SYMBOLS`, so skip
the code to set it too, thus avoiding unnecessary `message()` calls.
2016-12-06 08:18:33 -05:00
Kitware Robot
d6a1e2b90b CMake Nightly Date Stamp 2016-12-06 00:01:08 -05:00
Brad King
f8a1ba202f Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-11-02 (3c561c65)
2016-12-05 11:50:43 -05:00
Curl Upstream
93cc249f3d curl 2016-11-02 (3c561c65)
Code extracted from:

    https://github.com/curl/curl.git

at commit 3c561c657c2f0e553b19115a506592a8bbd744bc (curl-7_51_0).
2016-12-05 11:39:32 -05:00
Brad King
25d7b1ca9d curl: Update script to get curl 7.51.0 2016-12-05 11:39:12 -05:00
Brad King
41f1125931 Merge topic 'features-c++17'
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
2016-12-05 10:56:32 -05:00
Nils Gladitz
1b91e010bc Utilities/Release: Store WiX CMake install location in Windows registry 2016-12-05 16:05:19 +01:00
Brad King
7f307d9ea6 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-12-02 (4967ccc0)
2016-12-05 09:55:34 -05:00
KWSys Upstream
1b50bd3f5c KWSys 2016-12-02 (4967ccc0)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 4967ccc054d268c430e73445f3a103e737c5f5f7 (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      f1afce25 DynamicLoader: Re-organize preprocessor checks to use if, elif, else
      d94f92f7 DynamicLoader: Expand noop implementation to more platforms

Dāvis Mosāns (2):
      f069db91 Encoding: Fix conversion of strings that contain null bytes
      4967ccc0 ConsoleBuf: Fix output for strings that contain null byte
2016-12-05 09:55:32 -05:00
Brad King
d59010e47f Merge topic 'test-handler-multimap'
1af67b19 cmCTestTestHandler: use multimap
2016-12-05 09:23:33 -05:00
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