summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-282-2/+3
|
* 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 'optimize-variable-replacement'Brad King2015-09-281-0/+3
|\ \ | | | | | | | | | | | | 256c78ad Build: Set CMP0053 to NEW.
| * | Build: Set CMP0053 to NEW.Stephen Kelly2015-09-261-0/+3
| | | | | | | | | | | | | | | | | | If this policy is WARN, then the ReplaceVariableInString is executed with both the new algorithm and the OLD slow algorithm. The NEW algorithm should be used wherever it works.
* | | Merge topic 'test-Wno-dev'Brad King2015-09-283-0/+16
|\ \ \ | | | | | | | | | | | | | | | | bc3e1e4b Tests: Add case for -Wdev and -Wno-dev with non-message() warnings (#15747)
| * | | Tests: Add case for -Wdev and -Wno-dev with non-message() warnings (#15747)Michael Scott2015-09-253-0/+16
| |/ /
* | | 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
| |\ \ \
| | * | | KWSys 2015-09-25 (dc4e4a55)KWSys Robot2015-09-262-66/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ dc4e4a55 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' cfeb27cc..dc4e4a55 Ben Boeckel (1): dd466688 CTestCustom: use list(APPEND) Domen Vrankar (1): dc4e4a55 SystemTools: Handle directories in CopyFile{Always,IfDifferent}
* | | | | Merge topic 'ninja-cleanup-path-conversion'Brad King2015-09-2811-48/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2510-47/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'test-fix-C-comments'Brad King2015-09-282-14/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eb77a1c Tests: Use C-Style comments in C sources and headers
| * | | | | | Tests: Use C-Style comments in C sources and headersMarc Chevrier2015-09-252-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all C compilers tolerate C++-style comments in C code, so do not use them in our tests.
* | | | | | | Merge topic 'genex-SHELL_PATH'Brad King2015-09-2813-21/+123
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca6ba3fe Genex: Add a SHELL_PATH expression 7de868c4 Tests: Simplify GeneratorExpression check implementation
| * | | | | | | Genex: Add a SHELL_PATH expressionStefan Kislinskiy2015-09-2811-18/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Tests: Simplify GeneratorExpression check implementationBrad King2015-09-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a function instead of a macro so we do not need an extra layer of backslashes. Use a bracket argument to avoid another layer of extra backslashes.
* | | | | | | | Merge topic 'test-RunCMake-BuildDepends-Borland'Brad King2015-09-281-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67040500 Tests: Fix RunCMake.BuildDepends filesystem delay for Borland Makefiles
| * | | | | | | | Tests: Fix RunCMake.BuildDepends filesystem delay for Borland MakefilesBrad King2015-09-251-1/+7
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our 1.125s delay does not seem to be long enough to be reliable with the Borland "make" tool. Use a longer delay for Borland.
* | | | | | | | Merge topic 'jsoncpp-add-missing-cast'Brad King2015-09-281-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7fe4413 jsoncpp: Add missing cast to convert from char to UInt
| * | | | | | | | jsoncpp: Add missing cast to convert from char to UIntMarc Chevrier2015-09-251-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When parsing digits we know our `c - '0'` expression results in a non-negative value due to preceding conditions. Simply cast the result to UInt. This fixes compilation on SolarisStudio 12.4.
* | | | | | | | 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-2616-68/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fa17553 Revert topic 'cpack-package-empty-dirs'
| * | | | | | Revert topic 'cpack-package-empty-dirs'Brad King2015-09-2516-68/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2525-374/+41
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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-22604-15451/+21561
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2225-374/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge topic 'install-directory-dest-genex'Brad King2015-09-2511-8/+82
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd189cc2 install: Allow generator expressions in DIRECTORY DESTINATION
| * | | | | | | | install: Allow generator expressions in DIRECTORY DESTINATIONRobert Goulet2015-09-2411-8/+82
| | | | | | | | |
* | | | | | | | | Merge topic 'Threads-CXX'Brad King2015-09-2511-10/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fff9434d FindThreads: officially announce it works with only C++ enabled 66db914a FindThreads: fix printing a pointer value in test code 0b38424c FindThreads: make the call to try_run() work also if only C++ is enabled 9924a212 FindThreads: replace CheckIncludeFiles by CheckIncludeFile a27bc0cc Check(Function|Library|Symbol)Exists: make it work if only C++ is enabled 7279f293 FindThreads: add simple testcase
| * | | | | | | | | FindThreads: officially announce it works with only C++ enabledRolf Eike Beer2015-09-253-12/+27
| | | | | | | | | |
| * | | | | | | | | FindThreads: fix printing a pointer value in test codeRolf Eike Beer2015-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes a warning in C mode, and entirely fails in C++ mode: CMake/Modules/CheckForPthreads.c: In function ‘runner’: CMake/Modules/CheckForPthreads.c:34:27: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] printf("%d CC: %d\n", (int)args, cc); ^ Use %p to print out a pointer value, which will not cause any problems.
| * | | | | | | | | FindThreads: make the call to try_run() work also if only C++ is enabledRolf Eike Beer2015-09-251-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't enough to make the whole module work with only C++ enabled.
| * | | | | | | | | FindThreads: replace CheckIncludeFiles by CheckIncludeFileRolf Eike Beer2015-09-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, also add a branch using CheckIncludeFileCXX. Also give a better error message if no supported language is enabled. C++ support isn't working yet, but it has never worked.
| * | | | | | | | | Check(Function|Library|Symbol)Exists: make it work if only C++ is enabledRolf Eike Beer2015-09-255-5/+41
| | | | | | | | | |
| * | | | | | | | | FindThreads: add simple testcaseRolf Eike Beer2015-09-213-0/+21
| | | | | | | | | |
* | | | | | | | | | Merge topic 'fix-max-path-initialization'Brad King2015-09-256-32/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.