summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-add_custom_command-depfile'Brad King2016-08-3018-24/+103
|\ | | | | | | | | 048d1adb add_custom_command: Add DEPFILE option for Ninja
| * add_custom_command: Add DEPFILE option for NinjaKulla Christoph2016-08-3018-24/+103
| | | | | | | | | | | | | | | | Provide a way for custom commands to inform the ninja build tool about their implicit dependencies. For now simply make use of the option an error on other generators. Closes: #15479
* | CMake Nightly Date StampKitware Robot2016-08-301-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-08-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-08-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-08-271-1/+1
| |
* | Merge branch 'release'Brad King2016-08-260-0/+0
|\ \
| * \ Merge branch 'intel-fortran-mod-diff' into releaseBrad King2016-08-241-0/+6
| |\ \
* | \ \ Merge topic 'update-curl-script'Brad King2016-08-261-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 24e7ccb7 curl: Update script to get curl from new repository
| * | | | curl: Update script to get curl from new repositoryBrad King2016-08-261-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Curl is now hosted at https://github.com/curl/curl.git
* | | | Merge topic 'cpack-rpm-debuginfo-pkg'Brad King2016-08-266-2/+113
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 426f97d3 CPack/RPM: Add test for debuginfo package generation bc8c0add CPack RPM debuginfo packages generation
| * | | | CPack/RPM: Add test for debuginfo package generationDomen Vrankar2016-08-265-0/+50
| | | | |
| * | | | CPack RPM debuginfo packages generationIstvan Bodnar2016-08-251-2/+63
| |/ / / | | | | | | | | | | | | | | | | Added new variable to CPackRPM for debuginfo rpm package generation. Binaries will be checked for debug symbols.
* | | | Merge topic 'FindwxWidgets-library-path'Brad King2016-08-261-3/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 20d7da52 FindwxWidgets: Add VS-versioned library directory prefixes 4ef8a205 FindwxWidgets: Add version 3.1.0
| * | | | FindwxWidgets: Add VS-versioned library directory prefixesBrad King2016-08-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Visual Studio version number (supported: VS2008 to VS2015) to WX_LIB_DIR_PREFIX (old: vc / vc_x64; new: vc120 / vc120_x64). Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
| * | | | FindwxWidgets: Add version 3.1.0Brad King2016-08-251-0/+1
| | | | | | | | | | | | | | | | | | | | Patch-by: Hannes Grobler (Johnny_xy on gitlab.kitware.com)
* | | | | Merge topic 'test-driver-clang-tidy'Brad King2016-08-261-4/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cd344e3a create_test_sourcelist: Use safer strncpy instead of strcpy
| * | | | | create_test_sourcelist: Use safer strncpy instead of strcpySylvain Joubert2016-08-251-4/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Clang-tidy advises to use a safer function in place of strcpy. This should avoid such warnings in user build using clang-tidy.
* | | | | Merge topic 'vs-resource-pri-dir'Brad King2016-08-261-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f325ae18 VS: Use target-specific directory for `resources.pri`
| * | | | | VS: Use target-specific directory for `resources.pri`Brad King2016-08-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the `ProjectPriFullPath` field to a value that is unique to each target and not shared with others in order to avoid collisions. Closes: #16106
* | | | | | CMake Nightly Date StampKitware Robot2016-08-261-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'include-what-you-use'Brad King2016-08-2593-177/+642
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 38491644 CTest: fix include-what-you-use violations
| * | | | | CTest: fix include-what-you-use violationsDaniel Pfeifer2016-08-2593-177/+642
| | | | | |
* | | | | | Merge topic 'extract-cmMessenger'Brad King2016-08-2533-348/+435
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1462576b Parser: Port away from cmMakefile 421012a3 cmMessenger: Extract from cmake class 14a8d61f cmMakefile: Port nested error logic away from cmExecutionStatus 2af853de cmMakefile: Simplify IssueMessage implementation 33bb9cfa Parser: Issue messages through cmake, not cmSystemTools db7de303 Parser: Store the Backtrace for use in issuing messages
| * | | | | | Parser: Port away from cmMakefileStephen Kelly2016-08-254-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is an unneeded dependency.
| * | | | | | cmMessenger: Extract from cmake classStephen Kelly2016-08-257-168/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way messages can be issued independent of the cmake instance. It is now possible to make DisplayMessage a virtual interface and override it to handle messages in the cmake-gui or future IDE interaction interfaces.
| * | | | | | cmMakefile: Port nested error logic away from cmExecutionStatusStephen Kelly2016-08-254-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is no longer needed.
| * | | | | | cmMakefile: Simplify IssueMessage implementationStephen Kelly2016-08-251-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only called during configure time when the execution stack is non-empty.
| * | | | | | Parser: Issue messages through cmake, not cmSystemToolsStephen Kelly2016-08-2520-149/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make these messages uniform with regard to other messages issued by cmake.
| * | | | | | Parser: Store the Backtrace for use in issuing messagesStephen Kelly2016-08-241-0/+2
| | | | | | |
* | | | | | | Merge topic 'intel-fortran-mod-diff'Brad King2016-08-251-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | f699323a Fortran: Fix .mod file comparison for Intel 16 format
| * | | | | | Fortran: Fix .mod file comparison for Intel 16 formatBrad King2016-08-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel 16 format starts with the 0x0A 0x00 sequence that we use to skip past the timestamp. This occurrence appears to be a version number. Skip the first byte to avoid matching the sequence early. Ideally we should gain a better understanding of the format and avoid depending on short sequences that are likely to appear early by coincidence, but this approach will suffice for now. Closes: #16263
* | | | | | | Merge topic 'test-RunCMake.CMP0040-fix'Brad King2016-08-255-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 828e7632 Tests: Fix RunCMake.CMP0040 custom command syntax
| * | | | | | | Tests: Fix RunCMake.CMP0040 custom command syntaxBrad King2016-08-245-5/+5
| | | | | | | |
* | | | | | | | Merge topic 'update-kwsys'Brad King2016-08-251-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bc6dccc Merge branch 'upstream-KWSys' into update-kwsys fcc53247 KWSys 2016-08-24 (8e643b9b)
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-08-241-2/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-08-24 (8e643b9b)
| | * | | | | | KWSys 2016-08-24 (8e643b9b)KWSys Upstream2016-08-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 8e643b9b5f24d4cac68d59b1e2be9d161fb75974 (master). Upstream Shortlog ----------------- Brad King (1): 8e643b9b SystemTools: Fix crash in GetShortPath
* | | | | | | | CMake Nightly Date StampKitware Robot2016-08-251-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'update-third-party-git-2.9'Brad King2016-08-241-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions
| * | | | | | update-third-party: support Git 2.9.0's new merge restrictionsBen Boeckel2016-08-241-1/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use the `--allow-unrelated-histories` flag to declare that we Know What We're Doing™ (but only if necessary).
* | | | | | Merge branch 'release'Brad King2016-08-240-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge branch 'GetPrerequisites-fix-regression' into releaseBrad King2016-08-121-2/+6
| |\ \ \ \
* | \ \ \ \ Merge topic 'android-platform-modules'Brad King2016-08-24124-28/+2264
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b637ebd Android: Add `ANDROID` variable to indicate the target c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains 6b84df8d Help: Document cross compiling for Android d7d40830 Android: Select the STL type for NDK builds b22294bc Android: Populate compiler flags for current ABI b6a3102a Android: Add a CMAKE_BUILD_TYPE default d1e3cec2 Android: Add Clang -target option for current ABI 504db72d Android: Add placeholders for compiler/abi-specific settings fa632578 Android: Avoid interfering with common pre-existing toolchain files 6299693f Android: Search for NDK and standalone toolchain in more places 29b51379 Android: Detect and save a standalone toolchain without the NDK 7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set 4389664a Android: Detect and save a toolchain from the NDK 328191f6 Android: Set CMAKE_SYSROOT automatically 9e032304 Android: Detect and save the architecture, ABI, and processor fde59c4d Android: Detect and save the API level ...
| * | | | | | Android: Add `ANDROID` variable to indicate the targetBrad King2016-08-234-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects to use `if(ANDROID)` to condition their Android-specific code paths.
| * | | | | | Android: Add test cases covering use of the NDK and standalone toolchainsBrad King2016-08-2352-0/+568
| | | | | | |
| * | | | | | Help: Document cross compiling for AndroidBrad King2016-08-2318-27/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake now supports cross compiling for Android using the NDK or a standalone toolchain. Document the associated variables and how how to write toolchain files for Android.
| * | | | | | Android: Select the STL type for NDK buildsBrad King2016-08-2315-0/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate standard include directories and link libraries for the platform. Select the STL corresponding to CMAKE_ANDROID_STL_TYPE and matching the current ABI and toolchain to be used. Refer to the NDK sources/cxx-stl/*/Android.mk files for the needed file locations.
| * | | | | | Android: Populate compiler flags for current ABIBrad King2016-08-2317-0/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize the CMAKE_{C,CXX}_FLAGS{,_<CONFIG>} cache entries with flags for each ABI as specified by NDK toolchain `setup.mk` files.
| * | | | | | Android: Add a CMAKE_BUILD_TYPE defaultBrad King2016-08-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android NDK builds are always `debug` or `release`. We may populate flags for these configurations that are needed to produce compatible binaries. Ensure they are used by default.
| * | | | | | Android: Add Clang -target option for current ABIBrad King2016-08-129-0/+17
| | | | | | |