summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | cmLocalGenerator: Compute object max path on construction.Stephen Kelly2015-09-243-6/+4
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create all local generators after Configure().Stephen Kelly2015-09-241-1/+1
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Remove unused method.Stephen Kelly2015-09-242-7/+0
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create local generators after all makefiles configured.Stephen Kelly2015-09-243-7/+15
| | | | | | | |
| * | | | | | | cmGlobalGenerator: Create local generator after configuring the makefile.Stephen Kelly2015-09-241-2/+2
| | | | | | | |
| * | | | | | | cmMakefile: Create the local generator after configuring the makefile.Stephen Kelly2015-09-241-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local generator is not used during configure time.
| * | | | | | | Makefiles: Remove need to create local generator at configure time.Stephen Kelly2015-09-241-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is used during try_compile.
| * | | | | | | Makefiles: Port to cmOutputConverter.Stephen Kelly2015-09-241-1/+2
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-09-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'install-files-dest-genex'Brad King2015-09-2411-11/+50
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 69ab5f55 Tests: Cover install(FILES) with a genex DESTINATION 17aa6fd3 install: Allow generator expressions in FILES DESTINATION
| * | | | | | Tests: Cover install(FILES) with a genex DESTINATIONBrad King2015-09-237-6/+15
| | | | | | |
| * | | | | | install: Allow generator expressions in FILES DESTINATIONRobert Goulet2015-09-234-5/+35
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2015-09-241-1/+1
|/ / / / /
* | | | | Merge topic 'vs-target-ordering'Brad King2015-09-237-14/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40c7b461 VS: Fix rebuild with regeneration after input CMake code change (#15754) 03bfe71a VS: Refactor target ordering logic
| * | | | | VS: Fix rebuild with regeneration after input CMake code change (#15754)Brad King2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | VS: Refactor target ordering logicBrad King2015-09-227-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | Merge topic 'cpack-package-empty-dirs'Brad King2015-09-232-2/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | b761e90d CPack: remove accidental changes
| * | | | | CPack: remove accidental changesDomen Vrankar2015-09-232-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove changes accidentally included in commit b58de9fe (CPack: allow packaging of empty directories, 2015-09-22).
* | | | | | Merge topic 'fix-forced-toolchain-dialect'Brad King2015-09-237-21/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1375851 Project: Don't require computed default dialect if compiler was forced.
| * | | | | | Project: Don't require computed default dialect if compiler was forced.Stephen Kelly2015-09-227-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 7235334a (Project: Determine default language dialect for the compiler., 2015-09-15) introduced a mechanism to determine the default dialect used for the running compiler. If conditions in the <CompilerId>-<Lang>.cmake file are such that compile features for that version of the compiler should be supported, the _DEFAULT_STANDARD is set to the computed value. However, the CMakeForceCompiler module allows users to bypass execution of the compiler by CMake. In that case, do not set the _DEFAULT_STANDARD variable at all, which effectively disables the compile-features where the module is used. No compile features have ever been recorded where the module is used so no functionality is lost.
* | | | | | | CMake Nightly Date StampKitware Robot2015-09-231-1/+1
|/ / / / / /
* | | | | | Merge topic 'cpack-package-empty-dirs'Brad King2015-09-2217-3/+70
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | b58de9fe CPack: allow packaging of empty directories 47b060ae CPackDeb: allow empty directories in component packages
| * | | | | CPack: allow packaging of empty directoriesDomen Vrankar2015-09-2215-1/+67
| | | | | |
| * | | | | CPackDeb: allow empty directories in component packagesRaffi Enficiaud2015-09-212-2/+3
| | |/ / / | |/| | |
* | | | | Merge topic 'ctest-variable-docs'Brad King2015-09-2224-21/+151
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4da5a227 Help: document CTEST_CUSTOM_* variables 70c0cc72 ctest_read_custom_files: mention that ctest does this automatically 71c67e83 CTEST_CUSTOM_*: treat variables as lists 936a95d4 CTestCoverageCollectGCOV: replace tabulators
| * | | | | Help: document CTEST_CUSTOM_* variablesBen Boeckel2015-09-2220-6/+139
| | | | | |