summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release'Brad King2016-11-180-0/+0
|\
| * Merge branch 'backport-android-info-variables' into releaseBrad King2016-11-1811-6/+87
| |\
| * \ Merge branch 'armcc-response-file-flag' into releaseBrad King2016-11-151-0/+1
| |\ \
* | \ \ Merge topic 'backport-android-info-variables'Brad King2016-11-180-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | ea8eba0b Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE 0d3eb139 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 236d6244 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
| * | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-188-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-186-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-186-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | Merge topic 'backport-android-info-variables'Brad King2016-11-181-15/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 78db7090 Help: Drop release notes for backported Android variables
| * | | | Help: Drop release notes for backported Android variablesBrad King2016-11-181-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | These do not need to be called out in the 3.7 release notes because they are part of the new Android support feature already covered.
* | | | | Merge topic 'backport-android-info-variables'Brad King2016-11-180-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | e3cd5599 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE 5c2100e5 Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 790c0a89 Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
| * | | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-189-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-187-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-187-4/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | Merge topic 'auto_project_regeneration'Brad King2016-11-184-11/+65
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 427b6da9 VS: Teach `cmake --build` to reconfigure if needed before building
| * | | | VS: Teach `cmake --build` to reconfigure if needed before buildingYves Frederix2016-11-174-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio's build system does not cleanly handle itself being re-generated during the build. Teach `cmake --build` to check whether the build system needs to be re-generated before launching the native build tool.
* | | | | Merge topic 'tolerate-removed-cache'Brad King2016-11-184-0/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 25b6e7b7 Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/
| * | | | | Tolerate removed/replaced CMakeCache.txt with old CMakeFiles/Brad King2016-11-174-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users or scripts commonly remove or replace `CMakeCache.txt` without also removing `CMakeFiles/`. In this case the information saved in the cache from platform information initialization is missing, so we need to re-initialize it. In such a case, remove the platform information directory so that re-initialization will occur and restore needed information to the cache. Closes: #14820
* | | | | | Merge topic 'ExternalProject-cmd-poisoning'Brad King2016-11-181-68/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02445138 ExternalProject: Do not trip over pre-existing 'cmd' variable
| * | | | | | ExternalProject: Do not trip over pre-existing 'cmd' variableKarsten Sperling2016-11-171-68/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers of `_ep_get_build_command` do not initialize the output variable they pass and expect the function to unconditionally set it. Revise the function to not check its own output variable. Otherwise if a `cmd` variable happens to be set when `ExternalProject_Add` is called then it will be erroneously used as the default `BUILD`, `TEST`, and `INSTALL` command.
* | | | | | | Merge topic 'update-prebuilt-openssl'Brad King2016-11-181-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2dafeacb Utilities/Release: Update to openssl-1.0.2j
| * | | | | | | Utilities/Release: Update to openssl-1.0.2jBrad King2016-11-171-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | Merge topic 'xcode-add-override-keyword'Brad King2016-11-181-26/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0e223cd Xcode: Add override keyword to suppress warnings
| * | | | | | | Xcode: Add override keyword to suppress warningsGregor Jasny2016-11-171-26/+28
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2016-11-181-1/+1
|/ / / / / /
* | | | | | Merge topic 'android-info-variables'Brad King2016-11-1712-6/+102
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7c5e970 Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINE d95e6dff Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variable 3d42a72b Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION
| * | | | | | Android: Add CMAKE_<LANG>_ANDROID_TOOLCHAIN_MACHINEBrad King2016-11-149-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose the binutils' machine name (typically used as a prefix on the tool names) publicly. This is expected to match the `gcc -dumpmachine` value. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | Android: Add CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG variableBrad King2016-11-147-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK provides prebuilt toolchain files in directories named for the host architecture. The NDK build system calls this `HOST_TAG`. Expose the value publicly for use by clients that need to pass it to external tools. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
| * | | | | | Android: Always set CMAKE_ANDROID_NDK_TOOLCHAIN_VERSIONBrad King2016-11-147-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When this variable is not set by the user or toolchain file, set it to the default selected. This will be useful for client code that needs to pass the value to an external tool that needs to find the same toolchain in the NDK. Leave it empty for a standalone toolchain. Suggested-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | | | | | Merge topic 'cmake-m4-destination'Brad King2016-11-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da0e3f90 install: Configurable DESTINATION for the cmake.m4 file
| * | | | | | | install: Configurable DESTINATION for the cmake.m4 fileKonstantin Podsvirov2016-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DESTINATION changed from share/aclocal to ${CMAKE_XDGDATA_DIR}/aclocal.
* | | | | | | | Merge topic 'improve_ctest_memcheck_output'Brad King2016-11-178-17/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0d50957 ctest: Improve output for `-T memcheck`
| * | | | | | | | ctest: Improve output for `-T memcheck`Bill Hoffman2016-11-178-17/+43
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show how many defects each test that had a defect produced. Also tell the user where to find the full log files.
* | | | | | | | Merge topic 'update-kwsys'Brad King2016-11-172-1/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 451e9f93 Merge branch 'upstream-KWSys' into update-kwsys 572ac897 KWSys 2016-11-16 (a0c60eec)
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-11-162-1/+8
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-11-16 (a0c60eec)
| | * | | | | | KWSys 2016-11-16 (a0c60eec)KWSys Upstream2016-11-162-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit a0c60eec7cdbe7b5d0196bfc5b69bd969fe8786f (master). Upstream Shortlog ----------------- Brad King (2): 818405fc Fix typo in clang-format script documentation a0c60eec Terminal: Add tmux to VT100 color support whitelist Matt Leotta (1): 6a642f72 SystemInformation: Skip loopback devices in search for FQDN
* | | | | | | | CMake Nightly Date StampKitware Robot2016-11-171-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'ccmake_fix_print_keys'Brad King2016-11-162-49/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ca4abb2 ccmake: Correctly display edit mode and associated keys a9562eac ccmake: Add missing spaces to match the previous text length
| * | | | | | | ccmake: Correctly display edit mode and associated keysSylvain Joubert2016-11-152-49/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specific widgets can implement `PrintKeys` but their effects were hidden by the main widget `PrintKeys`. Fix this to give the user a better hint about the edit mode status. Closes: #13757
| * | | | | | | ccmake: Add missing spaces to match the previous text lengthSylvain Joubert2016-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a "glitch" leaving "it" on the screen
* | | | | | | | Merge topic 'test_vs_targets_file_reference'Brad King2016-11-165-0/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9560a9a Tests: Extend VS10Project to cover `.targets` file linking
| * | | | | | | | Tests: Extend VS10Project to cover `.targets` file linkingSoji Yamakawa2016-11-155-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With VS generators for 2010 and above, passing a `.targets` file to `target_link_libraries` is expected to generate content in the `.vcxproj` file to import the targets file. Add a test to cover this.
* | | | | | | | | Merge topic 'vs-suppress-upgrade-prompt'Brad King2016-11-161-0/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c8f7737 VS: Disable project upgrade prompt on VS 2013 and above
| * | | | | | | | | VS: Disable project upgrade prompt on VS 2013 and aboveErik Christensen2016-11-151-0/+10
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When opening projects in Visual Studio that specify an older toolset version, a prompt is displayed the first time asking the user whether to upgrade the projects. This is meant for project files that are maintained manually and updated through the IDE. For CMake-generated projects this does not make sense, so add content to tell VS not to upgrade.
* | | | | | | | | Merge topic 'msvc-no-explicit-_DEBUG'Brad King2016-11-161-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d0b5ff6 MSVC: Do not define _DEBUG explicitly when using /MDd
| * | | | | | | | | MSVC: Do not define _DEBUG explicitly when using /MDdBrad King2016-11-151-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the latter flag the compiler automatically defines `_DEBUG`: https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx Closes: #16430
* | | | | | | | | Merge topic 'Empty_CTestTestfile_on_BUILD_TESTING_OFF'Brad King2016-11-161-4/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae4cfa8b Remove CTestTestfile.cmake when BUILD_TESTING is OFF
| * | | | | | | | | Remove CTestTestfile.cmake when BUILD_TESTING is OFFSylvain Joubert2016-11-151-4/+7
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When disabling BUILD_TESTING after a previous configure, the `CTestTestfile.cmake` was left unchanged. As a result, ctest would see the tests while the user disabled testing. Now when BUILD_TESTING is OFF any existing `CTestTestfile.cmake` is removed ensuring an empty test list.
* | | | | | | | | Merge topic 'childEncoding'Brad King2016-11-1621-55/+493
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f55fcdc8 CTest: Use UTF-8 encoding for output from Git 40bd42df Add Encoding option for RunChild, RunMakeCommand and RunProcess 595feb32 Windows: Encode child process output to internally-used encoding 96103972 Add cmProcessOutput class to be used for decoding text data 92c865b8 cmCTestBuildHandler: Use size_t in ProcessBuffer length argument
| * | | | | | | | | CTest: Use UTF-8 encoding for output from GitDāvis Mosāns2016-11-151-6/+11
| | | | | | | | | |
| * | | | | | | | | Add Encoding option for RunChild, RunMakeCommand and RunProcessDāvis Mosāns2016-11-1412-27/+47
| | | | | | | | | |
generated by cgit v0.12 at 2025-09-15 13:11:49 (GMT)