summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'simplify-qt-autogen'Brad King2015-09-297-1107/+1208
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fe39020 QtAutogen: Port away from cmLocalGenerator. 59a729b2 QtAutogen: Split initializer class into separate file. 1e83a963 QtAutogen: Split initializer methods into separate class. 12f0e13c QtAutogen: Simplify generator initialization API. 65ff75d3 QtAutogen: Remove unnecessary dereference. 64b78c14 QtAutogen: Move Source initialization to prior loop. c3c20d3c QtAutogen: Add _automoc.cpp sources before initializing. 8b6ec29d QtAutogen: Move initialization condition to caller. 9470b056 QtAutogen: Move condition to prior loop. b7491b1c QtAutogen: Move condition to prior loop. e791c854 QtAutogen: Make some methods static. 6210ec64 QtAutogen: Make internal method private. a3ceb998 QtAutogen: Don't use members to initialize automoc targets. dced2fe1 QtAutogen: Rename variable. f9a77e76 QtAutogen: Don't use a member to store skipped uic files. c3633e7a QtAutogen: Add missing includes and forward declarations.
| * QtAutogen: Port away from cmLocalGenerator.Stephen Kelly2015-09-291-8/+7
| |
| * QtAutogen: Split initializer class into separate file.Stephen Kelly2015-09-296-1091/+1152
| |
| * QtAutogen: Split initializer methods into separate class.Stephen Kelly2015-09-263-40/+55
| |
| * QtAutogen: Simplify generator initialization API.Stephen Kelly2015-09-262-14/+12
| |
| * QtAutogen: Remove unnecessary dereference.Stephen Kelly2015-09-261-3/+3
| |
| * QtAutogen: Move Source initialization to prior loop.Stephen Kelly2015-09-261-2/+1
| | | | | | | | | | | | | | | | Ensure that all targets have their _automoc.cpp before attempting to initialize the autogen target. The initialization evaluates generator expressions for target sources, and must include the _automoc.cpp of object library dependents in order for TARGET_OBJECTS to include the object file for the corresponding _automoc.cpp file.
| * QtAutogen: Add _automoc.cpp sources before initializing.Stephen Kelly2015-09-263-2/+17
| |
| * QtAutogen: Move initialization condition to caller.Stephen Kelly2015-09-263-20/+18
| |
| * QtAutogen: Move condition to prior loop.Stephen Kelly2015-09-261-10/+12
| |
| * QtAutogen: Move condition to prior loop.Stephen Kelly2015-09-261-15/+16
| |
| * QtAutogen: Make some methods static.Stephen Kelly2015-09-263-26/+29
| |
| * QtAutogen: Make internal method private.Stephen Kelly2015-09-261-1/+2
| |
| * QtAutogen: Don't use members to initialize automoc targets.Stephen Kelly2015-09-262-19/+22
| |
| * QtAutogen: Rename variable.Stephen Kelly2015-09-261-2/+3
| |
| * QtAutogen: Don't use a member to store skipped uic files.Stephen Kelly2015-09-262-12/+12
| |
| * QtAutogen: Add missing includes and forward declarations.Stephen Kelly2015-09-261-0/+5
| |
* | Merge topic 'cpack-package-empty-dirs'Brad King2015-09-294-7/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | 9298f56d CPack: allow packaging of empty directories ecd71c9c SystemTools: time operations on directories 19c6f4ee SystemTools: set time file permissions 749a140a CPackDeb: allow empty directories in component packages
| * | CPack: allow packaging of empty directoriesDomen Vrankar2015-09-282-3/+11
| | |
| * | SystemTools: time operations on directoriesDomen Vrankar2015-09-281-4/+7
| | | | | | | | | | | | | | | On windows FILE_FLAG_BACKUP_SEMANTICS enables us to read/write time both on files and directories.
| * | SystemTools: set time file permissionsDomen Vrankar2015-09-281-2/+2
| | | | | | | | | | | | | | | | | | On Windows if file permissions are read only FILE_WRITE_ATTRIBUTES will enables us to get file handle and change file time.
| * | CPackDeb: allow empty directories in component packagesRaffi Enficiaud2015-09-281-0/+2
| | |
* | | Merge topic 'link-https-cmake.org'Brad King2015-09-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | da7276cf Replace http://www.cmake.org URLs with https://cmake.org
| * | | Replace http://www.cmake.org URLs with https://cmake.orgBrad King2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is now the preferred URL for visiting cmake.org with a browser. Convert using the shell code: git ls-files -z | xargs -0 sed -i 's|http://www\.cmake|https://cmake|g'
* | | | CMake Nightly Date StampKitware Robot2015-09-291-1/+1
| |/ / |/| |
* | | Merge topic 'minor-cleanups'Brad King2015-09-2824-86/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51e48637 VS: Remove impossible condition. 203eada6 cmMakefile: Remove Configured state. 5642449a cmCommand: Remove IsDiscouraged interface. 77c6a339 cmSetCommand: Re-use local named variable. 732f5511 cmSetCommand: Fix typo in comment. 8544f16d cmGlobalGenerator: Devirtualize method. 9096daaf Ninja: Remove unused variable.
| * | | VS: Remove impossible condition.Stephen Kelly2015-09-271-3/+2
| | | |
| * | | cmMakefile: Remove Configured state.Stephen Kelly2015-09-272-8/+0
| | | | | | | | | | | | | | | | It is vestigial.
| * | | cmCommand: Remove IsDiscouraged interface.Stephen Kelly2015-09-2718-71/+0
| | | | | | | | | | | | | | | | | | | | This used to affect documentation, but does not affect the Sphinx documentation.
| * | | cmSetCommand: Re-use local named variable.Stephen Kelly2015-09-271-1/+1
| | | |
| * | | cmSetCommand: Fix typo in comment.Stephen Kelly2015-09-271-1/+1
| | | |
| * | | cmGlobalGenerator: Devirtualize method.Stephen Kelly2015-09-271-1/+1
| | | |
| * | | Ninja: Remove unused variable.Stephen Kelly2015-09-271-1/+0
| | | |
* | | | Merge topic 'update-kwsys'Brad King2015-09-282-66/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 946e8615 Merge branch 'upstream-kwsys' into update-kwsys 29ad0694 KWSys 2015-09-25 (dc4e4a55)
| * | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-262-66/+72
| | | | |
* | | | | Merge topic 'ninja-cleanup-path-conversion'Brad King2015-09-287-48/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e2a4087 Ninja: Centralize path conversion in global generator (#15757) 993d0641 Ninja: Fix OBJECT_DIR placeholder substitution in link rules
| * | | | | Ninja: Centralize path conversion in global generator (#15757)Brad King2015-09-256-47/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Ninja generator we run all build rules from the top of the build tree rather than changing into each subdirectory. Therefore we convert all paths relative to the HOME_OUTPUT directory. However, the Convert method on cmLocalGenerator restricts relative path conversions to avoid leaving the build tree with a "../" sequence. Therefore conversions performed for "subdirectories" that are outside the top of the build tree always use full paths while conversions performed for subdirectories that are inside the top of the build tree may use relative paths to refer to the same files. Since Ninja always runs rules from the top of the build tree we should convert them using only the top-level cmLocalGenerator in order to remain consistent. Also extend the test suite with a case that fails without this fix.
| * | | | | Ninja: Fix OBJECT_DIR placeholder substitution in link rulesBrad King2015-09-251-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Convert the OBJECT_DIR value to the shell output format so that it is properly quoted when the path contains spaces.
* | | | | Merge topic 'genex-SHELL_PATH'Brad King2015-09-283-15/+49
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca6ba3fe Genex: Add a SHELL_PATH expression 7de868c4 Tests: Simplify GeneratorExpression check implementation
| * | | | | Genex: Add a SHELL_PATH expressionStefan Kislinskiy2015-09-283-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some commands on Windows do not understand forward slash paths and require backslashes. In order to help projects generate shell invocations of such commands, provide a generator expression to convert paths to the shell-preferred path format for the current generator. This will allow custom commands to generate paths the same way CMake does for compiler command invocations.
* | | | | | CMake Nightly Date StampKitware Robot2015-09-281-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2015-09-271-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'revert-cpack-package-empty-dirs'Brad King2015-09-263-27/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4fa17553 Revert topic 'cpack-package-empty-dirs'
| * | | | Revert topic 'cpack-package-empty-dirs'Brad King2015-09-253-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes in commit 47b060ae (CPackDeb: allow empty directories in component packages, 2015-09-21), commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-21), and commit b761e90d (CPack: remove accidental changes, 2015-09-22) regressed packaging of CMake itself. Revert the changes until they can be revised and rebased on other changes that make additional fixes.
* | | | | CMake Nightly Date StampKitware Robot2015-09-261-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'revert-cmake-W-options'Brad King2015-09-253-236/+39
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 2e606306 Merge branch 'improve-variable-help-formatting' into revert-cmake-W-options 81739e92 Revert topic 'cmake-W-options' (#15747)
| * | | Merge branch 'improve-variable-help-formatting' into revert-cmake-W-optionsBrad King2015-09-22100-3361/+4805
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Help/variable/CMAKE_ERROR_DEPRECATED.rst Help/variable/CMAKE_WARN_DEPRECATED.rst by integrating changes from both sides.
| * | | | Revert topic 'cmake-W-options' (#15747)Brad King2015-09-223-236/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'fix-try_compile-internal-argv'Brad King2015-09-251-5/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 710bde43 cmCoreTryCompile: Fix internal argument vector construction
| * | | | | cmCoreTryCompile: Fix internal argument vector constructionBrad King2015-09-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.