summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* AndroidTestUtilities: Add module to help drive Android device testsSchuyler Kylstra2016-09-3021-0/+486
| | | | | | Add a module to manage the data needed for the project tests. It will move the test data to the build directory and transfer necessary data to an Android device if that is enabled.
* Merge topic 'win64-binary-docs'Brad King2016-09-281-1/+0
|\ | | | | | | | | 93300f36 Utilities/Release: Add html docs to Windows 64-bit binary
| * Utilities/Release: Add html docs to Windows 64-bit binaryBrad King2016-09-281-1/+0
|/ | | | | | | | | | | | | | The 64-bit Windows binary is built in our second batch because it is built on the same host as the 32-bit Windows binary. When the documentation generation was first added, it was not included in the second batch because at the time that batch only included the Cygwin binary. Therefore the 64-bit Windows binary has been missing the documentation since it was first created for CMake 3.6. Since then the Cygwin binary was dropped so the second batch only contains the 64-bit Windows binary. Add the docs to it. Closes: #16333
* Merge topic 'simplify-license-notices'Brad King2016-09-281268-15041/+2885
|\ | | | | | | | | | | | | | | | | | | | | | | 19671831 Help: Update cmake-developer(7) module license docs for new notice 756169ac Tests: Update ModuleNotices test for new notice 845d86bc Utilities/Scripts: Remove temporary script that filtered license notices 86578ecc Simplify CMake per-source license notices b7180cfe Utilities/Scripts: Add temporary script to filter license notices 7feb4ecc Copyright.txt: Add notice of copyright by contributors 78f77f60 Utilities/KWStyle: Remove unused header check reference file 681e0429 Tests: Fix RunCMake.CTest output match to tolerate line number changes
| * Help: Update cmake-developer(7) module license docs for new noticeBrad King2016-09-271-43/+24
| |
| * Tests: Update ModuleNotices test for new noticeBrad King2016-09-271-18/+5
| |
| * Utilities/Scripts: Remove temporary script that filtered license noticesBrad King2016-09-271-49/+0
| |
| * Simplify CMake per-source license noticesBrad King2016-09-271263-14955/+2779
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
| * Utilities/Scripts: Add temporary script to filter license noticesBrad King2016-09-271-0/+49
| | | | | | | | | | | | Add a script to replace our previous per-source license notices with a much simpler notice. This will be used in a following commit and then removed.
| * Copyright.txt: Add notice of copyright by contributorsBrad King2016-09-271-11/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not require copyright assignment for contributions to CMake. Update the top-level notice to mention "Contributors" explicitly. Add a list of the Contributors whose names already appear in source-level copyright notices. Find the list with the command: $ git grep -h 'Copyright[^.]' -- *.* \ Auxiliary Modules Packaging Source Templates Tests \ | grep -v Kitware | sed 's/^#\? *//' | sort | uniq Manually refine the list to de-duplicate entries and filter out notices from third-party code.
| * Utilities/KWStyle: Remove unused header check reference fileBrad King2016-09-271-11/+0
| | | | | | | | We do not actually run a check for this.
| * Tests: Fix RunCMake.CTest output match to tolerate line number changesBrad King2016-09-271-3/+3
| |
* | Merge topic 'GNUInstallDirs-more-BSD'Brad King2016-09-281-1/+1
|\ \ | | | | | | | | | | | | 956054ae GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pages
| * | GNUInstallDirs: All *BSDs use ${PREFIX}/{man,info} for man and info pagesDmitry Marakasov2016-09-271-1/+1
| | |
* | | Merge topic 'findjni'Brad King2016-09-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 59eb75d9 FindJNI: Add aarch32 path on arm
| * | | FindJNI: Add aarch32 path on armOrion Poplawski2016-09-271-1/+1
| |/ /
* | | Merge topic 'silent-nsis-installs'Brad King2016-09-281-2/+2
|\ \ \ | | | | | | | | | | | | | | | | cb8db285 CPack/NSIS: Fix silent NSIS installs
| * | | CPack/NSIS: Fix silent NSIS installsCraig Scott2016-09-271-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The installer should not put up a message box to confirm uninstall of a previous version for silent installs. Furthermore, when the uninstaller is invoked, do not show its confirmation dialog because either (a) the installer already asked the user or (b) the installer is running in silent mode. Closes: #16328
* | | CMake Nightly Date StampKitware Robot2016-09-281-1/+1
| |/ |/|
* | Merge topic 'cpack-rpm-debuginfo-sources'Brad King2016-09-274-22/+253
|\ \ | | | | | | | | | | | | | | | | | | 39c7d62c CPack/RPM debuginfo packaging documentation dd3c938a CPack/RPM debuginfo directories to sources b78fcf0d CPack/RPM debuginfo packages must contain sources
| * | CPack/RPM debuginfo packaging documentationDomen Vrankar2016-09-271-8/+90
| | |
| * | CPack/RPM debuginfo directories to sourcesDomen Vrankar2016-09-272-4/+32
| | | | | | | | | | | | | | | | | | List of sources must be split into paths parts so that debuginfo package cleans up after itself.
| * | CPack/RPM debuginfo packages must contain sourcesDomen Vrankar2016-09-274-14/+135
| | | | | | | | | | | | | | | Issue #15668 fix was missing relevant source files in debuginfo package.
* | | Merge topic 'suppress-pgi-warnings'Brad King2016-09-271-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | 89c20300 CTestCustom: Suppress PGI warnings in generated Lexer/Parser code 965eb50c CTestCustom: Suppress PGI compiler warning summary line
| * | | CTestCustom: Suppress PGI warnings in generated Lexer/Parser codeBrad King2016-09-261-0/+1
| | | |
| * | | CTestCustom: Suppress PGI compiler warning summary lineBrad King2016-09-261-0/+2
| | |/ | |/| | | | | | | | | | We will match/ignore the actual warning lines, if any, so we can always ignore the summary line if present.
* | | 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