Brad King
b6667729cb
Tests: Simplify CTest.UpdateGIT QUIET mode test
...
Parameterize the dashboard script generation to configure custom
content. Also move state cleanup from previous test back to its block.
2015-06-11 10:57:20 -04:00
Brad King
f9285727dc
Merge branch 'release'
2015-06-10 08:50:19 -04:00
Kitware Robot
c9ee5de4af
CMake Nightly Date Stamp
2015-06-10 00:01:06 -04:00
Brad King
86bde2ef3e
CMake 3.3.0-rc2
2015-06-09 10:31:54 -04:00
Brad King
1c65ce5245
Merge branch 'release'
2015-06-09 10:31:04 -04:00
Brad King
ab660b8d22
Merge topic 'doc-policy-OLD-deprecated'
...
482a3bf3 Help: Document explicitly that policy OLD behavior is deprecated
2015-06-09 10:29:38 -04:00
Brad King
d6619acf77
Merge branch 'doc-policy-OLD-deprecated' into release
2015-06-09 09:33:50 -04:00
Brad King
482a3bf3f0
Help: Document explicitly that policy OLD behavior is deprecated
...
The most likely documentation page a project author will read in
response to a policy warning is the page for the policy itself.
Add to every policy documentation page a note explicitly stating
that the OLD behavior is deprecated. Also mention this in the
cmake_policy() command documentation that explains how to set a
policy to OLD.
Suggested-by: Fraser Hutchison <fraser.hutchison@gmail.com>
2015-06-09 09:29:41 -04:00
Brad King
223e2ec28d
Merge topic 'binary-release-osx-qt-4.8-update'
...
1594edba Utilities/Release: Update to more recent Qt 4.8 on OS X
2015-06-09 09:19:02 -04:00
Brad King
d78fbb6ad4
Merge topic 'move-CMP0059-handling'
...
52b9d828 cmMakefile: Move CMP0059 handling to command code.
fe603c7d cmGetDirectoryPropertyCommand: Move variable to the point of use.
8fc53c3c cmGetDirectoryPropertyCommand: Extract StoreResult method.
2015-06-09 09:19:00 -04:00
Brad King
1adcec3983
Merge topic 'doc-formatting'
...
c3f40f4f Help: Improve formatting of command documentation
2015-06-09 09:18:54 -04:00
Brad King
7f14943e5c
Merge topic 'doc-find-versioned-location'
...
7ab0806f Help: Document find_* command versioned/unversioned name ordering
2015-06-09 09:18:52 -04:00
Brad King
3e49888ff0
Merge topic 'doc-find-command-cleanup'
...
3de3544f Help: Improve documentation formatting of find_* commands
8c64c478 Help: Document CMAKE_FIND_APPBUNDLE and CMAKE_FIND_FRAMEWORK
25b4483e Help: Document CMAKE_SYSTEM_APPBUNDLE_PATH variable
e2f34986 Help: Document CMAKE_SYSTEM_FRAMEWORK_PATH variable
2015-06-09 09:18:50 -04:00
Brad King
f7be278a30
Merge topic 'doc-drop-incorrect-cmake-developer-advice'
...
972853b1 Help: Drop incorrect advice from cmake-developer.7 manual
2015-06-09 09:18:48 -04:00
Brad King
82986700d1
Merge topic 'ctest-script-mode-no-legacy-cygwin'
...
12436efc ctest: Disable CMake Cygwin legacy warning in dashboard client script
2015-06-09 09:18:46 -04:00
Brad King
a53d920290
Merge topic 'revert-mingw-no-find_library-dll'
...
f5dbf00d Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409 )
2015-06-09 09:18:44 -04:00
Brad King
d6011a61e9
Merge topic 'cmake-gui-osx-install-command-line'
...
d9b974b1 cmake-gui: Make command-line install help text selectable
2015-06-09 09:18:42 -04:00
Brad King
5a5a81e550
Merge topic 'FindwxWidgets-versioned-executable'
...
2c969743 FindwxWidgets: Fix find_program call for versioned names
2015-06-09 09:18:40 -04:00
Kitware Robot
2848f93d1a
CMake Nightly Date Stamp
2015-06-09 00:01:04 -04:00
Brad King
1594edba9e
Utilities/Release: Update to more recent Qt 4.8 on OS X
...
Update to a version newer than 4.8.0 to get the fix for this issue:
https://bugreports.qt.io/browse/QTBUG-23704
https://codereview.qt-project.org/13576
http://code.qt.io/cgit/qt/qt.git/commit/?id=e88dbaa7fc
We hit it in the cmake-gui command-line install help dialog.
2015-06-08 16:36:06 -04:00
Michael Scott
c3f40f4fd9
Help: Improve formatting of command documentation
...
Use inline reStructuredText markup and add cross-references in more
places.
2015-06-08 16:28:31 -04:00
Stephen Kelly
52b9d828ab
cmMakefile: Move CMP0059 handling to command code.
...
Don't pay a penalty for it in all GetProperty calls.
Additionally, the storage of properties will eventually move to
cmState, which should only contain state and not logic for policies
like this.
2015-06-08 22:23:44 +02:00
Stephen Kelly
fe603c7dfb
cmGetDirectoryPropertyCommand: Move variable to the point of use.
2015-06-08 22:18:42 +02:00
Stephen Kelly
8fc53c3ce8
cmGetDirectoryPropertyCommand: Extract StoreResult method.
2015-06-08 22:18:40 +02:00
Brad King
7ab0806fef
Help: Document find_* command versioned/unversioned name ordering
...
Suggest in the NAMES option that unversioned names go first to prefer
local builds over distro-provided files.
2015-06-08 16:13:56 -04:00
Brad King
3de3544fcd
Help: Improve documentation formatting of find_* commands
...
Use inline reStructuredText markup and add cross-references in more
places.
2015-06-08 15:52:21 -04:00
Brad King
8c64c4783d
Help: Document CMAKE_FIND_APPBUNDLE and CMAKE_FIND_FRAMEWORK
...
Add dedicated documents for these and link to them instead of
duplicating their documentation in every find command.
2015-06-08 15:45:59 -04:00
Brad King
25b4483ef8
Help: Document CMAKE_SYSTEM_APPBUNDLE_PATH variable
2015-06-08 15:21:47 -04:00
Brad King
e2f349864d
Help: Document CMAKE_SYSTEM_FRAMEWORK_PATH variable
2015-06-08 15:15:47 -04:00
Brad King
91131844ce
Merge branch 'doc-drop-incorrect-cmake-developer-advice' into release
2015-06-08 14:50:29 -04:00
Brad King
972853b15b
Help: Drop incorrect advice from cmake-developer.7 manual
...
Drop the comment on the purpose of PATH_SUFFIXES in our Find Module
example. It was incorrect.
2015-06-08 14:50:03 -04:00
Brad King
7ac02e0bc5
Merge branch 'revert-mingw-no-find_library-dll' into release
2015-06-08 14:18:04 -04:00
Brad King
40e1ed9f9d
Merge branch 'ctest-script-mode-no-legacy-cygwin' into release
2015-06-08 14:17:58 -04:00
Brad King
12436efc14
ctest: Disable CMake Cygwin legacy warning in dashboard client script
...
In ctest -S mode we load the CTestScriptMode module to give the
configuration scripts access to the host system information.
CYGWIN.cmake warns unless we explicitly tell it not to warn
since there is no chance for a cmake_minimum_required(VERSION)
to be called.
2015-06-08 14:16:28 -04:00
Brad King
d17aa60659
Merge topic 'data-layout'
...
8174e5cd cmCustomCommand: Remove special member functions.
34e1d6db cmCustomCommand: Re-arrange data layout.
54cb76f2 cmComputeLinkDepends: Re-arrange data layout.
b661d6c6 cmQtAutoGenerators: Re-arrange data layout.
40844a14 cmProcessTools: Re-arrange data layout.
b1ff32af cmOrderDirectories: Re-arrange data layout.
dd0417c7 cmInstallTargetGenerator: Re-arrange data layout.
125c4866 cmInstallFilesGenerator: Re-arrange data layout.
92b8b1fc cmGraphVizWriter: Re-arrange data layout.
7f3e1623 cmGlobalGenerator: Re-arrange data layout.
d9df7fa7 cmComputeComponentGraph: Re-arrange data layout.
db24e41b cmCommandArgumentParserHelper: Re-arrange data.
4cd13e80 cmComputeLinkInformation: Re-arrange data layout.
3e087a40 cmLocalUnixMakefileGenerator: Re-arrange data layout.
e0421701 cmMakefile: Re-arrange data layout.
c26696eb cmSourceFile: Re-arrange data.
...
2015-06-08 13:54:11 -04:00
Brad King
ccc6fe9445
Merge topic 'clean-up-cmMakefile'
...
4c192fb5 cmMakefile: Remove cacheOnly option from GetDefinitions.
046aafff cmGetCMakePropertyCommand: Don't explicitly specify default param.
021c4b6f cmMakefile: Simplify handling of CACHE_VARIABLES property.
1981c971 cmMakefile: Simplify InitializeFromParent method.
353e422b cmMakefile: Remove unused GetPolicies method.
00bfa047 cmMakefile: Out-of-line the cmMakefileCall.
db74ce58 cmMakefile: Inline PushScope into PushFunctionScope.
ca140c2e cmMakefile: Create a unified raii for macro scopes.
d5dc4169 cmMakefile: Create a unified raii for function scopes.
2015-06-08 13:54:09 -04:00
Brad King
21c92a00bf
Merge topic 'minor-cleanups'
...
4ab7d407 cmExportTryCompileFileGenerator: Add newline between methods.
e133e409 cmExportTryCompileFileGenerator: Remove unused variable.
c197c692 cmDocumentation: Remove unused include.
2015-06-08 13:54:07 -04:00
Brad King
f5690cc57c
Merge topic 'move-Feature-API'
...
f573bd22 cmLocalGenerator: Add Feature API from cmMakefile.
ccbc2259 cmGeneratorTarget: Move Feature API from cmTarget.
2015-06-08 13:54:05 -04:00
Brad King
d18852d596
Merge topic 'extract-cmOutputConverter'
...
59e21ffa Port static calls from cmLocalGenerator to cmOutputConverter.
242dcc2c cmListFileBacktrace: Replace local generator with cmState::Snapshot.
1cff330b cmTarget: Port to cmOutputConverter.
2f1bd62b cmCustomCommandGenerator: Port to cmOutputConverter.
0f2a1324 cmCommandArgumentParserHelper: Port to cmOutputConverter.
4d8b79ad cmComputeLinkInformation: Port to cmOutputConverter.
8680520f cmMakefile: Make the cmState::Snapshot accessible.
6d7abb63 cmOutputConverter: Extract from cmLocalGenerator.
a8244157 cmState::Snapshot: Provide accessor for the cmState.
1f4ef396 cmLocalGenerator: Remove some commented lines of code.
2015-06-08 13:54:02 -04:00
Brad King
c8997d1b32
Merge topic 'extract-cmLinkedTree'
...
4e5c70ab cmState: Extract a cmLinkedTree container adaptor.
7b9c7586 cmState: Group BuildsystemDirectory state together in a struct.
1b323949 cmState: Extend Snapshot concept with a SnapshotType.
2015-06-08 10:34:55 -04:00
Brad King
25136d7394
Merge topic 'vs-deterministic-guid'
...
cdf2cba3 VS: Use cmUuid RFC 4122 compliant hash based UUID generation
2015-06-08 10:34:53 -04:00
Brad King
534cc47cd6
Merge topic 'doc-add_custom_command-clarify-TARGET_FILE'
...
0e708d17 Help: Reference TARGET_FILE genex in add_custom_command docs (#15605 )
2015-06-08 10:34:51 -04:00
Brad King
092133b1ba
Merge topic 'ExternalProject_init_selected_submodules'
...
77ee6db5 Help: Add notes for topic 'ExternalProject_init_selected_submodules'
124243c0 ExternalProject: Add unit tests for GIT_SUBMODULES argument
14e2c3ad ExternalProject: Initialize only selected git submodules (#15590 )
2015-06-08 10:34:49 -04:00
Brad King
77ee6db505
Help: Add notes for topic 'ExternalProject_init_selected_submodules'
2015-06-08 10:27:06 -04:00
Daniele E. Domenichelli
124243c0eb
ExternalProject: Add unit tests for GIT_SUBMODULES argument
2015-06-08 10:27:06 -04:00
Brad King
f5dbf00da6
Windows-GNU: Restore find_library treatment of '.dll' as linkable ( #15409 )
...
Revert commit v3.3.0-rc1~435^2 (Windows-GNU: Do not tell find_library to
treat '.dll' as linkable, 2015-02-18). MinGW tools support linking to
'.dll' files directly and many non-CMake build systems still do not
provide a separate '.dll.a' file.
2015-06-08 10:16:18 -04:00
Brad King
c279078f14
Merge branch 'cmake-gui-osx-install-command-line' into release
2015-06-08 10:01:02 -04:00
Clinton Stimpson
d9b974b18e
cmake-gui: Make command-line install help text selectable
...
This will allow users to cut-n-paste the instructions over to a command
prompt.
2015-06-08 09:59:11 -04:00
Brad King
a20ca0c603
Merge branch 'FindwxWidgets-versioned-executable' into release
2015-06-08 09:19:39 -04:00
Brad King
2c96974315
FindwxWidgets: Fix find_program call for versioned names
...
In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in
addition to wx-config, 2015-04-29) we added a second (versioned) name to
the find_program call. Specifying multiple names requires use of the
NAMES option. Add it now. While at it, also add versioned names for
2.9 and 2.8.
2015-06-08 09:13:29 -04:00