summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Android: Record use of C++ by static libs in exported Android.mk filesBrad King2016-10-075-1/+22
| | | | | | | | When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a` file will have a link-time dependency on the C++ runtime libraries. Android NDK r14 will add a way to give this information to the NDK build system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file. Add this for exported static libraries that use C++.
* Merge topic 'doc-3.7-relnotes'Brad King2016-10-0364-390/+310
|\ | | | | | | | | | | 64e63da0 Help: Organize and revise 3.7 release notes e82c33b8 Help: Consolidate 3.7 release notes
| * Help: Organize and revise 3.7 release notesBrad King2016-10-011-164/+199
| | | | | | | | | | Add section headers similar to the 3.6 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.7 release notesBrad King2016-10-0164-390/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.7.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* | Merge topic 'FindBoost-1.62'Brad King2016-10-031-1/+1
|\ \ | | | | | | | | | | | | a997cac8 FindBoost: Add 1.62 and 1.62.0 as supported versions
| * | FindBoost: Add 1.62 and 1.62.0 as supported versionsRoger Leigh2016-10-031-1/+1
| | |
* | | Merge topic 'doc-target_link_libraries-flags'Brad King2016-10-031-0/+6
|\ \ \ | | | | | | | | | | | | | | | | 07bb2724 Help: Clarify treatment of link flags in target_link_libraries
| * | | Help: Clarify treatment of link flags in target_link_librariesJohn Beard2016-10-031-0/+6
| | | |
* | | | Merge topic 'cmake-server-teardown-file-monitor'Brad King2016-10-031-0/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 1b43f9d1 cmake-server: Stop the file monitor on client disconnect
| * | | cmake-server: Stop the file monitor on client disconnectBrad King2016-09-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the client disconnects we need to remove all events from our loop. Prior to the introduction of the file monitor we only needed to remove the client pipes. Now we need to remove the file monitor events too. Without this the event loop may continue to block on file monitor events. If one does eventually come in then the event handler may try to report it to the disconnected client and crash because our internal structures for writing to the client have been freed. This addresses a failure of the `Server` test on some machines.
* | | | CMake Nightly Date StampKitware Robot2016-10-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2016-10-021-1/+1
| |_|/ |/| |
* | | Merge topic 'doc-cmake-A-link'Brad King2016-10-016-8/+10
|\ \ \ | | | | | | | | | | | | | | | | 39c898a1 Help: Clarify that `cmake -A` option sets VS IDE target architecture
| * | | Help: Clarify that `cmake -A` option sets VS IDE target architectureBrad King2016-09-306-8/+10
| |/ /
* | | Merge topic 'doc-compilers-dropped'Brad King2016-10-011-0/+10
|\ \ \ | | | | | | | | | | | | | | | | 27c51865 Help: Add release note about compilers that no longer build CMake itself
| * | | Help: Add release note about compilers that no longer build CMake itselfBrad King2016-09-301-0/+10
| |/ / | | | | | | | | | | | | | | | | | | The introduction of libuv requires some intrinsics such as InterlockedOr that are not available on VS 2005 and below or on MinGW.org's mingw32. Add a release note that we no longer support these compilers for CMake itself.
* | | Merge topic 'autogen-fix-cmake-error'Brad King2016-10-011-2/+2
|\ \ \ | | | | | | | | | | | | | | | | a189d019 QtAutogen: Use cmSystemTools::Error instead of std::cerr
| * | | QtAutogen: Use cmSystemTools::Error instead of std::cerrSebastian Holtermann2016-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | We can use std::cerr only in the build-time tool, not during CMake generation.
* | | | Merge topic 'autogen-empty-qrc'Brad King2016-10-014-34/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | bcafc399 QtAutogen: Add test for empty qrc file 98b11f25 QtAutogen: Allow .qrc files that do not contain any file reference
| * | | QtAutogen: Add test for empty qrc fileSebastian Holtermann2016-09-303-0/+19
| | | |
| * | | QtAutogen: Allow .qrc files that do not contain any file referenceSebastian Holtermann2016-09-301-34/+33
| |/ /
* | | Merge topic 'aux_source_directory-sort'Brad King2016-10-011-4/+8
|\ \ \ | | | | | | | | | | | | | | | | 50b27de4 aux_source_directory: Sort results to make it deterministic
| * | | aux_source_directory: Sort results to make it deterministicJunghyun Kim2016-09-301-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.6.0-rc1~54^2 (file: Sort GLOB results to make it deterministic, 2016-05-14) makes sense for `aux_source_directory` too. Signed-off-by: Junghyun Kim <jh0822.kim@samsung.com>
* | | | Merge topic 'add-setup-projects-tests-module'Brad King2016-10-0121-0/+486
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 130784e0 AndroidTestUtilities: Add module to help drive Android device tests
| * | | | 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 'cmake-server-test-wait'Brad King2016-10-011-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d56f9237 Tests: Teach Server test to wait for server exit
| * | | | | Tests: Teach Server test to wait for server exitBrad King2016-09-301-0/+14
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | We expect the server to exit when its communication pipes are closed. Close them and wait for the server to exit. If supported by the current version of python, kill the server if it does not exit after a few seconds.
* | | | | CMake Nightly Date StampKitware Robot2016-10-011-1/+1
|/ / / /
* | | | Merge topic 'cmake-server-filewatcher'Brad King2016-09-3011-1/+584
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e34f042 server-mode: Watch CMakeLists.txt files 26250002 server-mode: Report watched files to client 0d96e193 server-mode: Add infrastructure to watch the filesystem
| * | | | server-mode: Watch CMakeLists.txt filesTobias Hunger2016-09-294-0/+87
| | | | | | | | | | | | | | | | | | | | Watch CMakeLists.txt files (and similar) from the Server
| * | | | server-mode: Report watched files to clientTobias Hunger2016-09-294-0/+49
| | | | | | | | | | | | | | | | | | | | * Add a command to report watched files and directories to clients.
| * | | | server-mode: Add infrastructure to watch the filesystemTobias Hunger2016-09-299-1/+448
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Enable the server to watch for filesystem changes. This patch includes * The infrastructure for the file watching * makes that infrastructure available to cmServerProtocols * Resets the filesystemwatchers on "configure"
* | | | Merge topic 'cmake-server-enable-more'Brad King2016-09-308-9/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 957e72c0 Utilities/Release: Use python 3 for server mode test on Linux binary 64934f20 Utilities/Release: Enable server mode in all binaries ec0bf638 bootstrap: Add options to enable/disable server mode explicitly 523f8ec8 server-mode: Add option to enable/disable test case explicitly 6b97a5ef server-mode: Add option to enable/disable the mode explicitly a8334961 server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODE 97b6e17c server-mode: Enable from bootstrapped CMake build
| * | | | Utilities/Release: Use python 3 for server mode test on Linux binaryBrad King2016-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The machine that builds the Linux binary has python 3 and 2.6, but the latter is too old for the server mode test script.
| * | | | Utilities/Release: Enable server mode in all binariesBrad King2016-09-294-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the CMake_ENABLE_SERVER_MODE option explicitly to the configuration of all binary builds. We want to know the mode is available if the build succeeds.
| * | | | bootstrap: Add options to enable/disable server mode explicitlyBrad King2016-09-291-0/+11
| | | | |
| * | | | server-mode: Add option to enable/disable test case explicitlyBrad King2016-09-292-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMake_TEST_SERVER_MODE` option that can be set in testing builds to enable/disable server mode tests explicitly. This will allow testing in combination with `CMake_TEST_EXTERNAL_CMAKE` or for server mode to be built on systems that have a python version that cannot run the test.
| * | | | server-mode: Add option to enable/disable the mode explicitlyBrad King2016-09-291-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a way for scripts building CMake to enable server mode explicitly and assume the risk of a build failure if it is not supported. This will allow such scripts to ensure that server mode is available if the build succeeds. It also allows scripts to explicitly disable server mode even if it would be supported.
| * | | | server-mode: Rename variable CMake_{HAVE => ENABLE}_SERVER_MODEBrad King2016-09-293-4/+4
| | | | | | | | | | | | | | | | | | | | The latter is a better name for making it a public-facing option.
| * | | | server-mode: Enable from bootstrapped CMake buildBrad King2016-09-291-1/+1
| |/ / / | | | | | | | | | | | | | | | | CMake is frequently built from source via bootstrap. There is no reason we cannot support server mode.
* | | | Merge topic 'update-libuv'Brad King2016-09-304-41/+84
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | f9cab9e3 Merge branch 'upstream-libuv' into update-libuv 66ac1feb libuv 2016-09-27 (8221f9b3)
| * \ \ \ Merge branch 'upstream-libuv' into update-libuvBrad King2016-09-294-41/+84
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * upstream-libuv: libuv 2016-09-27 (8221f9b3)
| | * | | libuv 2016-09-27 (8221f9b3)libuv upstream2016-09-294-41/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit 8221f9b305c09205be575d8d34a5c493ba03d392 (v1.x).
* | | | | Merge topic 'update-kwsys'Brad King2016-09-301-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | 6fe45e98 Merge branch 'upstream-KWSys' into update-kwsys 0ab471ad KWSys 2016-09-29 (6cfcbede)
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2016-09-291-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * upstream-KWSys: KWSys 2016-09-29 (6cfcbede)
| | * | | KWSys 2016-09-29 (6cfcbede)KWSys Upstream2016-09-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: http://public.kitware.com/KWSys.git at commit 6cfcbedeb253b64e6d07f436f1ac0f0b488bbc9b (master). Upstream Shortlog ----------------- Brad King (1): 6cfcbede SystemTools: Include strings.h on MinGW for strcasecmp
* | | | | CMake Nightly Date StampKitware Robot2016-09-301-1/+1
|/ / / /
* | | | Merge topic 'cmake_parse_arguments-PARSE_ARGV-multi-value'Brad King2016-09-296-21/+115
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 66c70cd9 cmake_parse_arguments: Add additional unit tests 41291b20 cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handling
| * | | | cmake_parse_arguments: Add additional unit testsMatthew Woehlke2016-09-285-29/+84
| | | | | | | | | | | | | | | | | | | | Add additional unit tests for some corner cases in argument splitting.
| * | | | cmake_parse_arguments: Fix PARSE_ARGV multi-value argument handlingMatthew Woehlke2016-09-282-4/+43
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `PARSE_ARGV` mode was recently added to help functions properly parse their arguments even when those arguments may be quoted and contain literal `;` in their values. Fix the implementation to encode `;`s in reported multi-value arguments and in `UNPARSED_ARGUMENTS` so that `;`s in the individual values are preserved in the lists. This allows clients to access all their argument values correctly.