summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'index-directories'Brad King2016-09-272-6/+27
|\ | | | | | | | | cda8c782 cmGlobalGenerator: Optimize FindMakefile method with an index
| * cmGlobalGenerator: Optimize FindMakefile method with an indexBrad King2016-09-262-6/+27
| | | | | | | | | | | | | | This method is used by directory get/set APIs. With the new `SUBDIRECTORIES` and `BUILDSYSTEM_TARGETS` methods projects may now make heavy use of these APIs to traverse their directory structure and process targets. Make this faster by indexing the directory lookups.
* | Merge topic 'codelite-organize-by-target'Brad King2016-09-276-95/+280
|\ \ | | | | | | | | | | | | cbe48879 CodeLite: Optionally use targets to create (sub)project files
| * | CodeLite: Optionally use targets to create (sub)project filesMinze Zwerver2016-09-266-95/+280
| | | | | | | | | | | | | | | | | | The basic codelite generator creates .project files based on the `project()` stanza. Add a `CMAKE_CODELITE_USE_TARGETS` option to use the targets instead.
* | | Merge topic 'cmake-server-basic-commands'Brad King2016-09-278-4/+561
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89043267 server-mode: Add command to compute the build system 0a8ad670 server-mode: Add a configure command 544f65f4 server-mode: Set global configuration of cmake via a command 82104cc7 server-mode: Query global configuration of cmake via a command
| * | | server-mode: Add command to compute the build systemTobias Hunger2016-09-264-1/+46
| | | |
| * | | server-mode: Add a configure commandTobias Hunger2016-09-264-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a command to trigger cmake to configure a project. Keep this separate from the compute step (added in the next commit) to faciliate applications like cmake-gui.
| * | | server-mode: Set global configuration of cmake via a commandTobias Hunger2016-09-266-4/+211
| | | | | | | | | | | | | | | | | | | | "setGlobalSettings" can be used to change settings reported by "globalSettings" command.
| * | | server-mode: Query global configuration of cmake via a commandTobias Hunger2016-09-268-3/+188
| | |/ | |/| | | | | | | | | | | | | | | | Add "globalSettings" command that returns: * Return capability information * Return currently used generator/extra generator * Return a range of flags for debug/trace/etc.
* | | Merge topic 'find-matlab-pthread'Brad King2016-09-271-1/+6
|\ \ \ | | | | | | | | | | | | | | | | 33ec71f3 FindMatlab: Fix -pthread check for projects with only C enabled
| * | | FindMatlab: Fix -pthread check for projects with only C enabledJamie Snape2016-09-261-1/+6
| | | |
* | | | Merge topic 'update-kwsys'Brad King2016-09-271-16/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 1798e495 Merge branch 'upstream-KWSys' into update-kwsys d15b7603 KWSys 2016-09-23 (80f820fc)
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-261-16/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-09-23 (80f820fc)
| | * | | KWSys 2016-09-23 (80f820fc)KWSys Upstream2016-09-261-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 80f820fcbb7cb9536a7c3886fa60c5c211559daf (master). Upstream Shortlog ----------------- Brad King (3): 66cd1138 ConsoleBuf: Avoid unnecessary initializations in test code 4e6c9410 ConsoleBuf: Remove extra flush operations from test code 80f820fc ConsoleBuf: Avoid use of __FUNCTION__ in tests
* | | | | Merge topic 'CPackNSIS-per-component-install'Brad King2016-09-273-6/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 06dea230 CPack/NSIS: Add custom component install directory
| * | | | | CPack/NSIS: Add custom component install directoryRoman Wüger2016-09-263-6/+45
| | |_|_|/ | |/| | |
* | | | | Merge topic 'FindBoost-1.62'Brad King2016-09-271-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9bb8ac8e FindBoost: update to 1.62
| * | | | | FindBoost: update to 1.62Tatsuyuki Ishi2016-09-251-0/+16
| | | | | |
* | | | | | Merge topic 'ninja-include-dir'Brad King2016-09-274-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 144cc6f1 Ninja: Add source location as include directory for preprocessed files
| * | | | | | Ninja: Add source location as include directory for preprocessed filesNils Gladitz2016-09-274-0/+22
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortran INCLUDE statements are not handled by the preprocessor. Since the location of the preprocessed file is distinct from the original source file explicitly add the source file's directory as an include path in the actual compile step (not the preprocessing step) so INCLUDE can find it. Closes: #16332
* | | | | | CMake Nightly Date StampKitware Robot2016-09-271-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'xcode-sdk-version'Brad King2016-09-261-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | 540815ee Xcode: Convert maybe unversioned OSX sysroot into versioned SDK path
| * | | | Xcode: Convert maybe unversioned OSX sysroot into versioned SDK pathGregor Jasny2016-09-251-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Xcode 8 the SDK folder also contains an unversioned entry: $ ls -l /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs drwxr-xr-x 5 root wheel 170 Mar 4 2018 MacOSX.sdk lrwxr-xr-x 1 root wheel 10 Sep 16 20:49 MacOSX10.12.sdk -> MacOSX.sdk If this unversioned path is used CMake cannot detect the SDK version. To work around the problem we always invoke the code path that translates short SDK names like "macosx10.12" into a path. That way we always end up with a versioned SDK path in _CMAKE_OSX_SYSROOT_PATH which is later used to determine the version. Closes: #16323
* | | | Merge topic 'auto-ptr'Brad King2016-09-264-1/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e6380b11 Use std::auto_ptr on compilers that do not warn about it 67480c05 Add a feature check to test availability of auto_ptr
| * | | | Use std::auto_ptr on compilers that do not warn about itDaniel Pfeifer2016-09-261-1/+9
| | | | |
| * | | | Add a feature check to test availability of auto_ptrDaniel Pfeifer2016-09-263-0/+20
| | | | |
* | | | | Merge topic 'revert-cpack-deb-package-description-fallback'Brad King2016-09-266-47/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1ef45a30 Revert "CPack/DEB: Make package description variable precedence match RPM"
| * | | | | Revert "CPack/DEB: Make package description variable precedence match RPM"Domen Vrankar2016-09-246-47/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 332b089ad213a1aa89658fffd8f68c9064c6d3db as multiline descriptions require special formatting.
* | | | | | Merge topic 'tidy-server'Brad King2016-09-263-28/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92207752 cmServer: add braces around conditional statements
| * | | | | | cmServer: add braces around conditional statementsDaniel Pfeifer2016-09-233-28/+53
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'ctest-no-manual-delete'Brad King2016-09-261-29/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b941f3bf CTest::CompressString: Avoid manual delete a5a7771a CTest::CompressString: Reorder code to avoid unnecessary allocation 6ed56457 CTest::Base64EncodeFile: Avoid manual delete
| * | | | | | CTest::CompressString: Avoid manual deleteDaniel Pfeifer2016-09-231-10/+5
| | | | | | |
| * | | | | | CTest::CompressString: Reorder code to avoid unnecessary allocationDaniel Pfeifer2016-09-231-8/+7
| | | | | | |
| * | | | | | CTest::Base64EncodeFile: Avoid manual deleteDaniel Pfeifer2016-09-231-12/+7
| |/ / / / /
* | | | | | Merge topic 'xcode-swift-version'Brad King2016-09-267-0/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b35568f3 Xcode: Add option to set Swift language version 49d50ad4 Xcode: Port rudimentary Swift support to Xcode 8
| * | | | | | Xcode: Add option to set Swift language versionBrad King2016-09-265-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new CMAKE_Swift_LANGUAGE_VERSION variable to specify the SWIFT_VERSION attribute in a generated Xcode project. Ideally this would be a `<LANG>_STANDARD` property but since Swift support is very minimal we should reserve that property for more complete treatment later. Issue: #16326
| * | | | | | Xcode: Port rudimentary Swift support to Xcode 8Brad King2016-09-233-0/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `.pbxproj` file must now specify a `SWIFT_VERSION` value. Set it to the legacy value of "2.3" for now. Later this can be made configurable (e.g. to "3.0").
* | | | | | Merge topic 'FindMatlab-simulink'Brad King2016-09-262-5/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b36408a0 FindMatlab: Add notes for topic 'FindMatlab-simulink' 7274fd9c FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to matlab_add_mex ccd1341a FindMatlab: Add SIMULINK component aaf4014c FindMatlab: Fix documentation
| * | | | | | FindMatlab: Add notes for topic 'FindMatlab-simulink'Brad King2016-09-231-0/+4
| | | | | | |
| * | | | | | FindMatlab: Add EXECUTABLE, MODULE, and SHARED options to matlab_add_mexJamie Snape2016-09-231-4/+24
| | | | | | |
| * | | | | | FindMatlab: Add SIMULINK componentJamie Snape2016-09-231-0/+16
| | | | | | |
| * | | | | | FindMatlab: Fix documentationJamie Snape2016-09-231-1/+2
| |/ / / / /
* | | | | | Merge topic 'fortran-submodule-test'Brad King2016-09-265-0/+95
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b66bc660 Tests: Add Fortran submodule tests
| * | | | | | Tests: Add Fortran submodule testsBrad King2016-09-235-0/+95
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Co-Author: Damian Rouson <damian@sourceryinstitute.org> Issue: #16234
* | | | | | CMake Nightly Date StampKitware Robot2016-09-261-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2016-09-251-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2016-09-241-1/+1
|/ / /
* | | Merge branch 'release'Brad King2016-09-230-0/+0
|\ \ \
| * \ \ Merge branch 'qtdialog-lib-paths' into releaseBrad King2016-09-231-0/+2
| |\ \ \
* | \ \ \ Merge topic 'ninja-fortran'Brad King2016-09-2312-10/+910
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33058150 Help: Document Ninja generator conditional Fortran support 59aae292 Ninja: Add dyndep rules for Fortran module dependencies 39ebfc79 Ninja: Add explicit preprocessing step for Fortran 9a77680e Ninja: Conditionally allow Fortran based on ninja 'dyndep' support 0f331d78 Ninja: Add internal tool to produce a ninja dyndep file for Fortran d3e0b64b Ninja: Add internal tool to scan Fortran code for module dependencies 8eca59a1 Ninja: Add comment with Fortran dependency design documentation a57d1bb7 Ninja: Add API to check for dyndep support 0488ae63 Ninja: Refactor ninja feature detection f0a23aa3 Ninja: Refactor Fortran rejection logic