summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmake: Teach -E copy[_if_different] to support multiple files (#15703)Bartosz Kosiorek2015-12-0423-19/+90
| | | | | | If multiple input files are provided then the destination must be a directory. If only one input file is provided then destination may be either a file or directory.
* cmake: Improve '-E' help message formattingBartosz Kosiorek2015-12-046-12/+12
|
* Merge topic 'regex-explorer'Brad King2015-12-047-0/+390
|\ | | | | | | | | fc656fa4 cmake-gui: Add regex explorer window
| * cmake-gui: Add regex explorer windowGregor Jasny2015-12-037-0/+390
| |
* | Merge topic 'improve-embarcadero'Brad King2015-12-048-5/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7a327727 Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__. 25211d75 Compiler ID: Compiler versions must be a valid, numeric version string. 060442c2 Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID. f3b3219c Embarcadero/Watcom: Properly skip VSResource test for other generators. ddbda722 Embarcadero: Fix bug where duplicate Ninja job pools would be created.
| * | Embarcadero: Fix erroneous interpretation of __CODEGEARC_VERSION__.James Johnston2015-12-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per the following link: http://docwiki.embarcadero.com/RADStudio/Seattle/en/Example_of_CODEGEARC_VERSION_Macro The major/minor versions must be decoded as a hex string, while the patch version must be decoded as a normal decimal string. As an example, C++ Builder XE 8.1's bcc32.exe sets this macro to 0x070189C9. The file version of bcc32.exe is 7.1.5570.35273. Therefore, the correct interpretation to COMPILER_VERSION would be 7.1.35273.
| * | Compiler ID: Compiler versions must be a valid, numeric version string.James Johnston2015-12-033-0/+21
| | | | | | | | | | | | This test helps catch errors in compiler identification.
| * | Embarcadero: Check code using CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID.James Johnston2015-12-032-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The CMAKE_CXX_COMPILER_ID and CMAKE_C_COMPILER_ID variables are set to "Borland" for older versions of the compiler. Newer CodeGear/Embarcadero compilers will have those variables set to "Embarcadero". Search for lines of code referencing both the variable name and Borland to be sure that they also refer to Embarcadero.
| * | Embarcadero/Watcom: Properly skip VSResource test for other generators.James Johnston2015-12-031-2/+1
| | | | | | | | | | | | | | | This test should be skipped based on the chosen compiler, not the chosen generator.
| * | Embarcadero: Fix bug where duplicate Ninja job pools would be created.James Johnston2015-12-031-1/+5
| | | | | | | | | | | | | | | If the platform file was included multiple times, it was possible that duplicate Ninja job pools would be created.
* | | Merge topic 'FindBoost-imported-targets'Brad King2015-12-047-0/+666
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d60cef77 Help: Add notes for topic 'FindBoost-imported-targets.rst' 9fd98750 Tests: Add FindBoost testcase for imported targets 3f9b081f FindBoost: Add imported targets 01c80acd FindBoost: Automatically add missing component dependencies 5183c6e5 FindBoost: Embed component dependency table 8a60e696 Utilities: Add BoostScanDeps script
| * | | Help: Add notes for topic 'FindBoost-imported-targets.rst'Brad King2015-12-021-0/+5
| | | |
| * | | Tests: Add FindBoost testcase for imported targetsRoger Leigh2015-12-024-0/+58
| | | | | | | | | | | | | | | | Enable by setting CMake_TEST_FindBoost to TRUE.
| * | | FindBoost: Add imported targetsRoger Leigh2015-12-021-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Targets include: - Boost::boost: Target for header-only dependencies - Boost::<C>: Target for specific component dependency - Boost::diagnostic_definitions: adds BOOST_LIB_DIAGNOSTIC - Boost::disable_autolinking: adds BOOST_ALL_NO_LIB - Boost::dynamic_linking: adds BOOST_ALL_DYN_LINK
| * | | FindBoost: Automatically add missing component dependenciesRoger Leigh2015-12-021-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function _Boost_MISSING_DEPENDENCIES will look at the user-supplied component list, check the dependency information for each component using _Boost_COMPONENT_DEPENDENCIES, and will add any missing dependencies to the component list. This ensures that all required components will be searched for.
| * | | FindBoost: Embed component dependency tableRoger Leigh2015-12-021-0/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The function _Boost_COMPONENT_DEPENDENCIES is used to query the library dependencies for a given component for a given version of Boost. This covers Boost releases from 1.33 to 1.59, using the information generated by Utilities/Scripts/BoostScanDeps.cmake.
| * | | Utilities: Add BoostScanDeps scriptRoger Leigh2015-12-021-0/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This script scans Boost headers in order to determine inter-library dependencies, using the "autolink" information embedded in the headers for automatic linking on Windows. This information is then output in a form suitable for use in FindBoost.cmake.
* | | | Merge topic 'ios-framework-resource-layout'Brad King2015-12-049-17/+108
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e76ee2c0 iOS: Fix framework resource directory layout (#15848)
| * | | | iOS: Fix framework resource directory layout (#15848)Bartosz Kosiorek2015-12-039-17/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A typical iOS application bundle (also Framework Bundle) contains the application executable and any resources used by the application (for instance, the application icon, other images, and localized content) in the top-level bundle directory. The same rule applies to Framework Bundles.
* | | | | CMake Nightly Date StampKitware Robot2015-12-041-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2015-12-031-1/+1
|/ / /
* | | Merge branch 'release'Brad King2015-12-020-0/+0
|\ \ \ | |/ / |/| |
| * | CMake 3.4.1v3.4.1Brad King2015-12-021-1/+1
| | |
* | | Merge branch 'release'Brad King2015-12-020-0/+0
|\ \ \ | |/ /
| * | Merge branch 'backport-NIOS2-CPU' into releaseBrad King2015-12-022-0/+8
| |\ \
| * \ \ Merge branch 'include-for-mode_t' into releaseBrad King2015-12-021-0/+2
| |\ \ \
| * \ \ \ Merge branch 'reduce-realpath-calls' into releaseBrad King2015-12-012-4/+28
| |\ \ \ \
* | \ \ \ \ Merge topic 'cmake-W-options'Brad King2015-12-0227-77/+396
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aac633d5 Explicitly enable deprecated warnings by default. e8974b62 Modify dev warning options to affect deprecated warnings. b146747e Consistent documentation for deprecation message variables. da688bcb Add -W options to control deprecated warning messages. 07388f83 Refactor the -W options parser to be generic. 246b0bfb Explicitly enable author (dev) warnings by default. deec3a3f Make message suppression more consistent. aa427a42 Tests: Revise message in RunCMake.CommandLine -Wdev case
| * | | | | | Explicitly enable deprecated warnings by default.Michael Scott2015-12-018-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly enable deprecated warnings by default, via the cmake::GetSuppressDeprecatedWarnings method, which signals suppression is turned off unless the CMake variables are set as required. Add tests and update the documentation for the new functionality.
| * | | | | | Modify dev warning options to affect deprecated warnings.Michael Scott2015-12-014-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the '-Wdev' and '-Wno-dev' options to also enable and suppress the deprecated warnings output, via the 'CMAKE_WARN_DEPRECATED' CMake variable, by default. This action does not happen if the user specifies a deprecated warning message option. Add tests and update the documentation for the new functionality.
| * | | | | | Consistent documentation for deprecation message variables.Michael Scott2015-12-011-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documentation for the 'CMAKE_ERROR_DEPRECATED' CMake variable consistent with the documentation for the 'CMAKE_WARN_DEPRECATED' CMake variable, in terms of wording.
| * | | | | | Add -W options to control deprecated warning messages.Michael Scott2015-12-019-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'deprecated' warning options type, to allow setting CMAKE_WARN_DEPRECATED via the -W '-Wdeprecated' and '-Wno-deprecated' options. Add tests for new options and updated documentation.
| * | | | | | Refactor the -W options parser to be generic.Michael Scott2015-12-017-36/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the -Wdev and -Wno-dev options parser to use a generic -W parser that follows the GCC pattern, excluding support for -Werror=TYPE and -Wno-error=TYPE formats for now.
| * | | | | | Explicitly enable author (dev) warnings by default.Michael Scott2015-12-018-6/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly enable author warnings by default, via the cmake::GetSuppressDevWarnings method, which signals suppression is turned off unless the CMake variables are set as required. Add test cases for author and deprecated messages displayed by default.
| * | | | | | Make message suppression more consistent.Michael Scott2015-11-308-24/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the message suppression more consistent, by adding a check for the message related CMake variables in cmake::IssueMessage, which allows callers of IssueMessage other than the message command to behave as expected. Also added a check for CMAKE_SUPPRESS_DEVELOPER_WARNINGS in the message command to mirror the deprecated message type behaviour. Added a 'force' flag to the cmake::IssueMessage method, to make the message suppression consistent, when setting the message related CMake variables directly in a CMake file. Expand message command tests to cover the AUTHOR_WARNING message type as well.
| * | | | | | Tests: Revise message in RunCMake.CommandLine -Wdev caseMichael Scott2015-11-303-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use more prose-like capitalization.
* | | | | | | Merge topic 'backport-NIOS2-CPU'Brad King2015-12-020-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | f2ca704c Add NIOS2 CPU support
| * | | | | | Add NIOS2 CPU supportMarek Vasut2015-12-022-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add necessary bits to support the NIOS2 little-endian CPU. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Ley Foon Tan <lftan@altera.com> Cc: Thomas Chou <thomas@wytron.com.tw> Cc: Walter Goossens <waltergoossens@home.nl>
* | | | | | | Merge topic 'cpack-dmg-multilanguage-sla'Brad King2015-12-023-8/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae434ee2 CPack/DragNDrop: Allow single license for multiple languages
| * | | | | | | CPack/DragNDrop: Allow single license for multiple languagesSimon Levermann2015-12-023-8/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When both CPACK_DMG_SLA_DIR and CPACK_RESOURCE_FILE_LICENSE are defined, use the license file for all languages instead of looking for a license file for each language. Also expand the documentation on the SLA variables.
* | | | | | | | Merge topic 'include-for-mode_t'Brad King2015-12-021-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 001043ac Include `sys/types.h` header to get `mode_t`
| * | | | | | | Include `sys/types.h` header to get `mode_t`Kylie McClain2015-12-021-0/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Do not depend on it being included by other system headers. It is not included by others on musl-libc, for example.
* | | | | | | Merge topic 'reduce-realpath-calls'Brad King2015-12-022-4/+28
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 4e3cf8b0 cmOrderDirectories: Reduce repeat realpath() calls 6b185287 cmOrderDirectories: Factor out directory comparison
| * | | | | | cmOrderDirectories: Reduce repeat realpath() callsBrad King2015-12-012-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~110^2 (Tolerate symlinks during RPATH ordering, 2014-09-09) we call realpath() for every directory ordering constraint check. On some platforms/filesystems this is slow, so memoize the result of the call for each directory.
| * | | | | | cmOrderDirectories: Factor out directory comparisonBrad King2015-12-012-4/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | Create an `IsSameDirectory` helper method.
* | | | | | Merge topic 'update-kwsys'Brad King2015-12-023-31/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe05ad97 Merge branch 'upstream-kwsys' into update-kwsys e25f294a KWSys 2015-12-01 (9596e98d)
| * \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-12-013-31/+28
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | KWSys 2015-12-01 (9596e98d)KWSys Robot2015-12-013-31/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 9596e98d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' a7e5360f..9596e98d Dmitry Marakasov (1): b86a2a3e Process: Fix off-by-one when adding two times Marek Vasut (1): ddfa8019 CPU: Add NIOS2 support Rolf Eike Beer (2): 0adafb51 SystemTools: use FindProgram() overload that checks for directory 9596e98d SystemTools: move some code around that is used only on Windows-like platforms
* | | | | | | Merge topic 'update-kwiml'Brad King2015-12-021-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58c1840a Merge branch 'upstream-kwiml' into update-kwiml eec87ec8 KWIML: Teach ABI.h that NIOS2 CPU is little-endian
| * \ \ \ \ \ \ Merge branch 'upstream-kwiml' into update-kwimlBrad King2015-11-301-0/+4
| |\ \ \ \ \ \ \