summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Android: Add placeholders for compiler/abi-specific settingsBrad King2016-08-1221-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android NDK source repository at https://android.googlesource.com/platform/ndk.git has `<ndk>/build/core/toolchains/*/setup.mk` files that store tables of information for their build system. Add an equivalent file for each compiler/abi combination.
| * | | Android: Avoid interfering with common pre-existing toolchain filesBrad King2016-08-125-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commonly used Android toolchain files that pre-date CMake upstream support may need to be updated to work with our new functionality. They typically set CMAKE_SYSTEM_VERSION to 1, so detect that and skip our upstream Android settings. When such toolchain files are updated to account for our upstream support, they can then set CMAKE_SYSTEM_VERSION to a valid Android API and get new behavior.
| * | | Android: Search for NDK and standalone toolchain in more placesBrad King2016-08-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Commonly used Android toolchain files that pre-date CMake upstream support use a few environment and CMake variables as search locations. Use them too to aid transition.
| * | | Android: Detect and save a standalone toolchain without the NDKBrad King2016-08-124-5/+115
| | | |
| * | | Android: Detect settings from the CMAKE_SYSROOT if it is setBrad King2016-08-121-1/+68
| | | |
| * | | Android: Detect and save a toolchain from the NDKBrad King2016-08-122-0/+296
| | | |
| * | | Android: Set CMAKE_SYSROOT automaticallyBrad King2016-08-121-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Compute CMAKE_SYSROOT automatically for the current API and architecture selection. This causes the --sysroot option to be passed to GNU and Clang compilers.
| * | | Android: Detect and save the architecture, ABI, and processorBrad King2016-08-121-1/+88
| | | | | | | | | | | | | | | | | | | | Add new CMakeSystem.cmake entries for the architecture and ABI. Store the processor in CMAKE_SYSTEM_PROCESSOR.
| * | | Android: Detect and save the API levelBrad King2016-08-121-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | Store the Android API level in CMAKE_SYSTEM_VERSION. If it is not provided by the user, initialize it from CMAKE_ANDROID_API or fall back to finding the latest available in the NDK.
| * | | Android: Detect and save the NDK directoryBrad King2016-08-121-0/+27
| | | | | | | | | | | | | | | | Add a new CMakeSystem.cmake entry for the NDK location.
| * | | Android: Suppress new functionality with Nsight Tegra in VS IDE buildsBrad King2016-08-125-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | Support for NVIDIA Nsight Tegra Visual Studio Edition was previously implemented in the CMake VS IDE generators. Avoid interfering with that functionality for now. Later we may try to integrate this.
| * | | Android: Add placeholders for platform-specific initializationBrad King2016-08-122-0/+29
| | | | | | | | | | | | | | | | | | | | Add infrastructure modules to be loaded when initializing builds targeting Android platforms.
| * | | Android: Add placeholders for platform-specific compiler selectionBrad King2016-08-123-0/+25
| | | | | | | | | | | | | | | | | | | | Add infrastructure modules to be loaded for determining a compiler selection when targeting Android platforms.
| * | | Android: Add placeholders for platform-specific compiler settingsBrad King2016-08-127-0/+77
| | | | | | | | | | | | | | | | | | | | Add infrastructure modules to be loaded for Clang and GNU compilers when targeting Android platforms.
| * | | CMakeDetermine*Compiler: Add hook to save custom compiler informationBrad King2016-08-123-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Provide a way for Platform/<os>-Determine-<lang>.cmake modules to save platform-specific information about the compiler in the configured CMake<lang>Compiler.cmake modules.
| * | | CMakeDetermineSystem: Load platform-specific helper modulesBrad King2016-08-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once CMAKE_SYSTEM_NAME is known, load a platform-specific Platform/<os>-Determine module in order to enable custom determination of the other settings needed for the CMakeSystem module (e.g. CMAKE_SYSTEM_PROCESSOR). Also add a hook in Modules/CMakeSystem.cmake.in to allow platform-specific information to be saved.
* | | | Merge topic 'extend-find-package-search-path'Brad King2016-08-249-9/+82
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 828d6c13 find_package: Extend search path for combined Windows/UNIX convention ff5c89de Help: Widen find_package search path table
| * | | | find_package: Extend search path for combined Windows/UNIX conventionSilvio Traversaro2016-08-249-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Find packages that install their cmake package configuration files in `lib/cmake/<name>` when they are installed in the default Windows CMAKE_INSTALL_PREFIX, `C:/Program Files/<name>`. Closes: #16212
| * | | | Help: Widen find_package search path tableSilvio Traversaro2016-08-231-7/+7
| | | | | | | | | | | | | | | | | | | | Make room for additional longer entries.
* | | | | Merge topic 'include-what-you-use'Brad King2016-08-2433-67/+192
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5cbb5488 fix a batch of include-what-you-use violations
| * | | | | fix a batch of include-what-you-use violationsDaniel Pfeifer2016-08-2333-67/+192
| | | | | |
* | | | | | Merge topic 'doc-get_cmake_property'Brad King2016-08-241-3/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15cc50fb Help: Clarify get_cmake_property command documentation
| * | | | | | Help: Clarify get_cmake_property command documentationBrad King2016-08-231-3/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | Closes: #13810, #16258
* | | | | | Merge topic 'FindCUDA-fix-arch-regex'Brad King2016-08-241-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dc9a754 FindCUDA: Support `2.1(2.0)` architecture notation
| * | | | | | FindCUDA: Support `2.1(2.0)` architecture notationBoris Fomitchev2016-08-231-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Also tweak some messages and comments.
* | | | | | Merge topic 'test-extra-generator-dedup'Brad King2016-08-241-47/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9bd0643a Tests: Refactor testing of extra generators.
| * | | | | | Tests: Refactor testing of extra generators.Chaoren Lin2016-08-231-47/+30
| |/ / / / / | | | | | | | | | | | | | | | | | | Use a loop instead of repeating the same thing multiple times.
* | | | | | Merge topic 'version-cleanups'Brad King2016-08-242-9/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aec06dd4 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1 ef13efab Version: Remove check for existence of CVS repository
| * | | | | | Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1Brad King2016-08-232-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmVersionConfig.h we must define this macro with a value because clients expect it to have one. Also ensure that all CMakeLists.txt code paths have an initialized value. Reported-by: Stephen Kelly <steveire@gmail.com>
| * | | | | | Version: Remove check for existence of CVS repositoryStephen Kelly2016-08-231-7/+0
| | | | | | |
* | | | | | | Merge topic 'import-vim-syntax'Brad King2016-08-248-40/+271
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4556b47 Help: Add release notes for 'vim-cmake-syntax' import 25c01cf0 Aux: Install vim-cmake-syntax files with CMake e3ac68cf Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntax 4a22c06e vim-cmake-syntax 2016-08-16 (e782679c) f21a8235 Aux: Drop vim files prior to import of third-party version 0966f1c5 Add script to update vim-cmake-syntax from upstream
| * | | | | | | Help: Add release notes for 'vim-cmake-syntax' importBrad King2016-08-171-0/+11
| | | | | | | |
| * | | | | | | Aux: Install vim-cmake-syntax files with CMakeBrad King2016-08-171-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntaxBrad King2016-08-174-0/+869
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2016-08-16 (e782679c)
| | * | | | | | | vim-cmake-syntax 2016-08-16 (e782679c)vim-cmake-syntax upstream2016-08-174-0/+869
| | / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit e782679cb93a4ccb419cffbc1c076db0d524d43e (master).
| * | | | | | | Aux: Drop vim files prior to import of third-party versionBrad King2016-08-174-674/+0
| | | | | | | |
| * | | | | | | Add script to update vim-cmake-syntax from upstreamBrad King2016-08-171-0/+24
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2016-08-241-1/+1
| |_|/ / / / / |/| | | | | |
generated by cgit v0.12 at 2024-09-23 02:33:50 (GMT)