Commit Graph

22155 Commits

Author SHA1 Message Date
Brad King 8ff8766232 Merge topic 'vs-refactor-libs'
8ba6dc36 VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries
1d04d2ce VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
2017-02-15 08:24:13 -05:00
Brad King 6a5e5a9268 Merge topic 'vs-dedup-tag'
f7e5c682 VS: De-duplicate PreprocessorDefinitions tag name
2017-02-15 08:24:10 -05:00
Brad King 75040fc103 Merge topic 'update-kwsys'
ff843dbd Merge branch 'upstream-KWSys' into update-kwsys
ced3396d KWSys 2017-02-14 (5c6f7836)
2017-02-15 08:24:00 -05:00
Kitware Robot 8b155a6c09 CMake Nightly Date Stamp 2017-02-15 00:01:04 -05:00
Brad King f7e5c6820a VS: De-duplicate PreprocessorDefinitions tag name
Store the name in a variable for re-use.
2017-02-14 13:37:54 -05:00
Brad King 8ba6dc362d VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries
Make the VS generator consistent with the Ninja and Makefile generators
that place the libraries listed in this variable after other libraries
on the link command line.  These system libraries never depend on the
project libraries.
2017-02-14 11:21:08 -05:00
Brad King 1d04d2ce36 VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
Parse the value as a command line string just as the MS CRT would.
This makes the VS generator behavior consistent with how the string
is used by the Ninja and Makefile generators.
2017-02-14 11:15:08 -05:00
Brad King ff843dbd54 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-02-14 (5c6f7836)
2017-02-14 09:22:07 -05:00
Brad King dc58d9f06d Merge topic 'command-cleanup'
e0f39312 cmCommands: add commands directly to cmState
72dcbbe5 split Default commands into Scripting and Project
7fb14775 cmDisallowedCommand: extract policy checking from cmCommand
615e2a17 cmCommand: Don't prefix error message with command name
45b49099 cmCommand: make noncopyable
5396bc92 cmCommand: remove member Helper
2017-02-14 08:30:33 -05:00
Brad King 31e96ccca2 Merge topic 'execute_process-default-encoding'
07c3380a execute_process: Restore no-decoding default behavior
4168bc18 Help: Improve execute_process ENCODING option documentation
2017-02-14 08:30:27 -05:00
Kitware Robot 11e9605179 CMake Nightly Date Stamp 2017-02-14 00:01:05 -05:00
Daniel Pfeifer e0f3931226 cmCommands: add commands directly to cmState 2017-02-13 22:39:20 +01:00
Daniel Pfeifer 72dcbbe5c0 split Default commands into Scripting and Project 2017-02-13 22:32:55 +01:00
Daniel Pfeifer 7fb14775a3 cmDisallowedCommand: extract policy checking from cmCommand
Implement cmDisallowedCommand as a wrapper class for cmCommand.
2017-02-13 21:37:08 +01:00
Daniel Pfeifer 615e2a17e4 cmCommand: Don't prefix error message with command name
Instead, prefix the error message at the two places where the errors are
handled: cmMakefile and cmCTestHandlerCommand.
2017-02-13 20:49:20 +01:00
Daniel Pfeifer 45b49099d9 cmCommand: make noncopyable 2017-02-13 20:48:29 +01:00
Daniel Pfeifer 5396bc92d0 cmCommand: remove member Helper
The Helper member is used in a single derived class only.
Remove it from the base class to the only place where it is used.
2017-02-13 20:48:29 +01:00
Brad King 07c3380a6e execute_process: Restore no-decoding default behavior
Since commit v3.8.0-rc1~232^2 (execute_process: Add ENCODING option for
Windows child process output, 2016-11-23) we decode child process output
using the console's active codepage by default.  This differs from
previous versions of CMake and is therefore incompatible.  Changing this
default will require a policy, so for now revert the default behavior
back to performing no decoding.

Reported-by: Nils Gladitz <nilsgladitz@gmail.com>
2017-02-13 13:53:17 -05:00
Brad King 0c4379353f Merge topic 'erase-if'
c3800e54 cmAlgorithms: add cmEraseIf function
2017-02-13 11:41:46 -05:00
Kitware Robot 0cab748cf8 CMake Nightly Date Stamp 2017-02-13 00:01:04 -05:00
Kitware Robot 26662fc3d3 CMake Nightly Date Stamp 2017-02-12 00:01:04 -05:00
Kitware Robot 6c8d659631 CMake Nightly Date Stamp 2017-02-11 00:01:08 -05:00
Daniel Pfeifer c3800e5458 cmAlgorithms: add cmEraseIf function 2017-02-10 23:04:32 +01:00
Brad King ee3295e917 Merge topic 'vs-nasm'
5ba2c9e5 VS: Add support for ASM_NASM language
2017-02-10 13:36:18 -05:00
Kitware Robot ada0bc21f4 CMake Nightly Date Stamp 2017-02-10 00:01:08 -05:00
Kitware Robot 90a55bb1d2 CMake Nightly Date Stamp 2017-02-09 00:01:05 -05:00
Kitware Robot 7e42a43c14 CMake Nightly Date Stamp 2017-02-08 00:01:07 -05:00
Evgeny Fimochkin 5ba2c9e5e0 VS: Add support for ASM_NASM language
Fixes: #16469
2017-02-07 13:20:52 -05:00
Brad King 4dbd03f6ef Merge topic 'wix-custom-root-id'
558a69fc CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
2017-02-07 09:59:39 -05:00
Brad King 7642ca21b7 Merge topic 'update-kwsys'
c2645e19 Merge branch 'upstream-KWSys' into update-kwsys
95983ed8 KWSys 2017-02-06 (ef673998)
2017-02-07 09:59:36 -05:00
Kitware Robot 0a09717ea3 CMake Nightly Date Stamp 2017-02-07 00:01:12 -05:00
Nils Gladitz 558a69fc90 CPackWIX: Introduce new CPACK_WIX_ROOT_FOLDER_ID variable
The new variable allows specification of a custom root folder ID.
The implicit default is "ProgramFiles<64>Folder".

The "<64>" token is replaced by "" for 32-bit and "64" for 64-bit builds.

Inspired-By: Eric Backus
Fixes: #16573
2017-02-06 14:53:16 -05:00
Brad King c2645e1979 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-02-06 (ef673998)
2017-02-06 13:01:40 -05:00
Brad King 0f4dae0a4d Begin post-3.8 development 2017-02-06 11:28:55 -05:00
Brad King 566d20771f CMake 3.8.0-rc1 version update 2017-02-06 11:27:03 -05:00
Brad King 811c854eff Merge topic 'vs-quote-rerun-paths'
f8f3cb8d VS: Fix quoting of special characters in cmake re-run check commands
2017-02-06 10:29:46 -05:00
Brad King cf1bc84216 Merge topic 'productbuild_signing'
48aad9cd CPackProductBuild: Add options to sign packages
2017-02-06 10:29:44 -05:00
Brad King f8f3cb8d65 VS: Fix quoting of special characters in cmake re-run check commands
Fix our calls to `AddCustomCommandToOutput` for adding cmake re-run
check commands to disable old-style quoting in favor of the full quoting
logic.  This is necessary when paths contain special characters like `&`
that old-style quoting logic does not handle.

This also requires us to expand the `$(SolutionPath)` placeholder
explicitly because otherwise its expanded value will no longer be quoted
correctly.  As a side effect, this fixes the value in VS 10 and above
where the placeholder may be undefined when driving the build through
MSBuild without the `.sln` file.

Reported-by: Steven Cook <sc@harshbutfair.org>
Fixes: #16585
2017-02-06 09:53:15 -05:00
Kitware Robot a00cca97b3 CMake Nightly Date Stamp 2017-02-06 00:01:04 -05:00
Kitware Robot c054221ffd CMake Nightly Date Stamp 2017-02-05 00:01:05 -05:00
Roman Wüger 48aad9cda0 CPackProductBuild: Add options to sign packages 2017-02-04 08:07:48 -05:00
Kitware Robot d5f0c69611 CMake Nightly Date Stamp 2017-02-04 00:01:05 -05:00
Kitware Robot 6286d26ca6 CMake Nightly Date Stamp 2017-02-03 00:01:05 -05:00
Kitware Robot 134ffe9794 CMake Nightly Date Stamp 2017-02-02 00:01:05 -05:00
Kitware Robot 1f8da86115 CMake Nightly Date Stamp 2017-02-01 00:01:07 -05:00
Brad King 5accbaccbc Merge topic 'vs-export-external-objects'
4dde0bc8 VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
2017-01-31 09:04:19 -05:00
Brad King f012a95836 Merge topic '16432-static-frameworks'
071f8e78 Apple: Add support for static frameworks
d525754e Xcode: Refactor RunCMake.Framework test to prepare for static frameworks
45405f00 Xcode: Ignore Xcode project warning until issue is fixed
50e1c105 Makefile: For static libraries remove only the "real" lib before creating
8643ca75 Makefile: Re-order list of files to clean
2017-01-31 09:04:16 -05:00
Gregor Jasny 071f8e78dd Apple: Add support for static frameworks
Closes: #16432
2017-01-31 08:59:15 -05:00
Kitware Robot 07d3695e75 CMake Nightly Date Stamp 2017-01-31 00:01:05 -05:00
Zsolt Parragi 4dde0bc8ef VS: Fix WINDOWS_EXPORT_ALL_SYMBOLS for external objects
Teach Visual Studio generators to include external object files in the
list of objects whose symbols are to be exported.  The Makefile and
Ninja generators already did this.
2017-01-30 08:54:49 -05:00