Stephen Kelly
e791c85419
QtAutogen: Make some methods static.
2015-09-26 19:32:52 +02:00
Stephen Kelly
6210ec644a
QtAutogen: Make internal method private.
2015-09-26 19:32:52 +02:00
Stephen Kelly
a3ceb998d7
QtAutogen: Don't use members to initialize automoc targets.
2015-09-26 19:32:50 +02:00
Stephen Kelly
dced2fe10f
QtAutogen: Rename variable.
2015-09-26 19:21:49 +02:00
Stephen Kelly
f9a77e76e4
QtAutogen: Don't use a member to store skipped uic files.
2015-09-26 18:48:23 +02:00
Stephen Kelly
c3633e7a41
QtAutogen: Add missing includes and forward declarations.
2015-09-26 18:48:23 +02:00
Brad King
414cc18a9a
Merge topic 'revert-cmake-W-options'
...
2e606306 Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options
81739e92 Revert topic 'cmake-W-options' (#15747 )
2015-09-25 16:16:17 -04:00
Brad King
02f95f9b7c
Merge topic 'fix-try_compile-internal-argv'
...
710bde43 cmCoreTryCompile: Fix internal argument vector construction
2015-09-25 10:12:42 -04:00
Brad King
5a83303f50
Merge topic 'install-directory-dest-genex'
...
bd189cc2 install: Allow generator expressions in DIRECTORY DESTINATION
2015-09-25 10:12:40 -04:00
Brad King
ede54544f1
Merge topic 'fix-max-path-initialization'
...
8bfff686 cmLocalGenerator: Compute object max path on construction.
2c2479fb cmGlobalGenerator: Create all local generators after Configure().
194bb068 cmGlobalGenerator: Remove unused method.
c5f07e05 cmGlobalGenerator: Create local generators after all makefiles configured.
dd408de4 cmGlobalGenerator: Create local generator after configuring the makefile.
8a88089b cmMakefile: Create the local generator after configuring the makefile.
934aa454 Makefiles: Remove need to create local generator at configure time.
61b48e70 Makefiles: Port to cmOutputConverter.
2015-09-25 10:12:35 -04:00
Kitware Robot
7c0b22a84e
CMake Nightly Date Stamp
2015-09-25 00:01:06 -04:00
Brad King
710bde43aa
cmCoreTryCompile: Fix internal argument vector construction
...
In TryCompileCode we construct an internal argv[] vector that needs to
have a fake argv[0] so our internal cmake command line looks like a real
command line. Fix construction of the fake argv[0] when try_compile is
called without the CMAKE_FLAGS argument. Otherwise the first internal
-DVAR=val argument that we use to pass information like
CMAKE_OSX_SYSROOT is ignored.
2015-09-24 15:26:32 -04:00
Brad King
cbfae8c3f2
Merge topic 'install-files-dest-genex'
...
69ab5f55 Tests: Cover install(FILES) with a genex DESTINATION
17aa6fd3 install: Allow generator expressions in FILES DESTINATION
2015-09-24 10:28:54 -04:00
Robert Goulet
bd189cc24e
install: Allow generator expressions in DIRECTORY DESTINATION
2015-09-24 09:13:03 -04:00
Stephen Kelly
8bfff68642
cmLocalGenerator: Compute object max path on construction.
2015-09-24 09:39:39 +02:00
Stephen Kelly
2c2479fbed
cmGlobalGenerator: Create all local generators after Configure().
2015-09-24 09:39:39 +02:00
Stephen Kelly
194bb06803
cmGlobalGenerator: Remove unused method.
2015-09-24 09:39:39 +02:00
Stephen Kelly
c5f07e0537
cmGlobalGenerator: Create local generators after all makefiles configured.
2015-09-24 09:39:38 +02:00
Stephen Kelly
dd408de46b
cmGlobalGenerator: Create local generator after configuring the makefile.
2015-09-24 09:39:38 +02:00
Stephen Kelly
8a88089bbe
cmMakefile: Create the local generator after configuring the makefile.
...
The local generator is not used during configure time.
2015-09-24 09:39:38 +02:00
Stephen Kelly
934aa454d0
Makefiles: Remove need to create local generator at configure time.
...
This method is used during try_compile.
2015-09-24 09:39:38 +02:00
Stephen Kelly
61b48e70bc
Makefiles: Port to cmOutputConverter.
2015-09-24 09:39:38 +02:00
Kitware Robot
02ccef2ae5
CMake Nightly Date Stamp
2015-09-24 00:01:05 -04:00
Robert Goulet
17aa6fd362
install: Allow generator expressions in FILES DESTINATION
2015-09-23 14:37:17 -04:00
Brad King
c3b3284c93
Merge topic 'vs-target-ordering'
...
40c7b461 VS: Fix rebuild with regeneration after input CMake code change (#15754 )
03bfe71a VS: Refactor target ordering logic
2015-09-23 09:23:01 -04:00
Brad King
3779716616
Merge topic 'cpack-package-empty-dirs'
...
b761e90d CPack: remove accidental changes
2015-09-23 09:22:59 -04:00
Domen Vrankar
b761e90d70
CPack: remove accidental changes
...
Remove changes accidentally included in commit b58de9fe (CPack: allow
packaging of empty directories, 2015-09-22).
2015-09-23 09:15:57 -04:00
Kitware Robot
44f2ade2cb
CMake Nightly Date Stamp
2015-09-23 00:01:05 -04:00
Brad King
2e6063068c
Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options
...
Resolve conflicts in
Help/variable/CMAKE_ERROR_DEPRECATED.rst
Help/variable/CMAKE_WARN_DEPRECATED.rst
by integrating changes from both sides.
2015-09-22 13:57:08 -04:00
Brad King
81739e9215
Revert topic 'cmake-W-options' ( #15747 )
...
The changes in commit c96fe0b4 (cmake: Add -W options to control
deprecation warnings and errors, 2015-07-28) fail to account for
-Wdev warnings produced by places in CMake other than message().
This causes a regression in which -Wno-dev fails to suppress such
warnings. Revert the feature until it can be revised accordingly.
2015-09-22 13:53:09 -04:00
Brad King
442d17ef6c
Merge topic 'cpack-package-empty-dirs'
...
b58de9fe CPack: allow packaging of empty directories
47b060ae CPackDeb: allow empty directories in component packages
2015-09-22 10:47:11 -04:00
Brad King
da7c8a8dae
Merge topic 'restrict-shlib-link-flags-to-enable-exports'
...
b15f4e9b try_compile: Propogate CMP0065 to the generated project.
9784af1b CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS
2015-09-22 10:46:59 -04:00
Brad King
4be709a6b7
Merge topic 'fix-policy-CMP0064-version'
...
402bf096 CMP0064: Fix recorded version of introduction to be 3.4
2015-09-22 10:46:57 -04:00
Brad King
f1365f3206
Merge topic 'fix-windows-version-detection'
...
17009189 Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 (#15674 )
2015-09-22 10:46:54 -04:00
Brad King
40c7b46123
VS: Fix rebuild with regeneration after input CMake code change ( #15754 )
...
When using "cmake --build ." or "MSBuild ALL_BUILD.vcxproj" to drive the
build the dependencies in the .sln file are not considered. This means
that ProjectReference elements in .vcxproj files are used to order
targets. We must ensure that the ZERO_CHECK target is listed as the
first dependency of every target so that when it causes regeneration of
the build files then MSBuild has not yet loaded the updated files.
2015-09-22 10:26:00 -04:00
Brad King
03bfe71ae0
VS: Refactor target ordering logic
...
Refactor cmGlobalVisualStudioGenerator::TargetCompare to store the name of
the target that should come first instead of hard-coding "ALL_BUILD".
Update client sites to specify "ALL_BUILD" when ordering for .sln files
and an empty string otherwise (in cases when "ALL_BUILD" should not be
encountered anyway).
2015-09-22 10:25:58 -04:00
Kitware Robot
dce7d8befb
CMake Nightly Date Stamp
2015-09-22 00:01:04 -04:00
Domen Vrankar
b58de9fe2b
CPack: allow packaging of empty directories
2015-09-22 02:08:26 +02:00
Raffi Enficiaud
47b060aee0
CPackDeb: allow empty directories in component packages
2015-09-22 01:57:44 +02:00
Chuck Atkins
b15f4e9b86
try_compile: Propogate CMP0065 to the generated project.
...
Set policy CMP0065 to the value used in the calling project.
Set the the value of CMAKE_ENABLE_EXPORTS if set in the calling
project to initialize the target property appropriately.
2015-09-21 10:12:13 -04:00
Chuck Atkins
9784af1b50
CMP0065: Restrict the use of CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS
...
This new policy restricts the addition of the shared library link flags
to executables only when the ENABLE_EXPORTS property is set to True.
2015-09-21 10:12:13 -04:00
Brad King
402bf096ec
CMP0064: Fix recorded version of introduction to be 3.4
...
This policy was added for CMake 3.4 but accidentally recorded as 3.3.
Fix this and update the RunCMake.CMP0064 test WARN case accordingly.
2015-09-21 10:05:02 -04:00
Brad King
38830fc0ca
Merge topic 'cpack-deb-checksum-on-symlinks'
...
da295f45 CPack/Deb: checksum on symlinks release notes
7c7874c8 CPackDeb: preventing md5sum on symlinks
2015-09-21 09:25:31 -04:00
Brad King
dd8285c688
Merge topic 'fix-compatibility-mode-LOCATION'
...
2514e426 CMP0026: Use compatibility codepath until configure is finished (#15748 )
b98f7712 cmGlobalGenerator: Add API for the configure step being finished.
b5de2bd9 cmLocalGenerator: Simplify condition.
2015-09-21 09:25:29 -04:00
Brad King
4f640afc1a
Merge topic 'ninja-refactor-msvc-deps'
...
109a7a24 Ninja: Detect MSVC /showIncludes prefix with compiler flags (#15596 )
828c05b9 Ninja: Refactor lookup of cmcldeps location
c73fbda6 CMakeDetermineCompilerId: Drop unused code path
2015-09-21 09:25:27 -04:00
Brad King
82a0c7be3f
Merge topic 'ctest-custom-output-size'
...
fd47df45 CTest: Add options to limit output of passed and failed tests
6e3151f6 CTest: Document and test custom output size settings
2015-09-21 09:25:24 -04:00
Gilles Khouzam
17009189f8
Windows: Fix CMAKE_HOST_SYSTEM_VERSION on Windows >= 8 ( #15674 )
...
According to GetVersionEx documentation:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms724451.aspx
https://msdn.microsoft.com/en-us/library/windows/desktop/dn481241.aspx
we must manifest each application to explicitly declare support for each
version of Windows.
2015-09-21 09:02:41 -04:00
Kitware Robot
358b564145
CMake Nightly Date Stamp
2015-09-21 00:01:04 -04:00
Kitware Robot
ba7f7067ca
CMake Nightly Date Stamp
2015-09-20 00:01:05 -04:00
Kitware Robot
0da7a4d4c7
CMake Nightly Date Stamp
2015-09-19 00:01:05 -04:00