summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'split-cmState'Brad King2016-10-20152-2350/+2552
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e6eecec7 cmListFileCache: Remove cmState header include e3587ee0 cmTargetPropertyComputer: Add missing include e0a84904 cmState: Split auxiliary classes into separate files a91eaf38 cmState: Port dependents to new cmStateTypes header 27be1d81 cmState: Move extracted declarations to a separate file 34433c88 cmState: Remove compatibility typedefs cde6eb62 cmState: Port dependent code to new cmStateSnapshot name a9bf981a cmState: Move Snapshot type to separate namespace 17d27893 cmState: Port dependent code to new cmStateDirectory name 34bcec39 cmState: Move Directory class to separate namespace 2fe3e55d cmState: Move CacheEntryType enum to separate namespace a49751fb cmState: Move TargetType enum to separate namespace 0060391d cmState: Move SnapshotType enum to separate namespace 5bc964ed cmState: Move PositionType to separate namespace 2dc40996 cmState: Move PolicyStackEntry to separate namespace cb40af5d cmState: Move SnapshotDataType to separate namespace ...
| * cmListFileCache: Remove cmState header includeStephen Kelly2016-10-1944-1/+44
| | | | | | | | | | Include it in dependents which have previously relied on it transitively.
| * cmTargetPropertyComputer: Add missing includeStephen Kelly2016-10-191-0/+1
| |
| * cmState: Split auxiliary classes into separate filesStephen Kelly2016-10-1925-1133/+1228
| | | | | | | | | | | | | | Port dependents to the new locations as needed. Leave behind a cmState.h include in cmListFileCache to reduce noise. It is removed in a following commit.
| * cmState: Port dependents to new cmStateTypes headerStephen Kelly2016-10-1962-61/+62
| |
| * cmState: Move extracted declarations to a separate fileStephen Kelly2016-10-192-45/+56
| |
| * cmState: Remove compatibility typedefsStephen Kelly2016-10-191-3/+0
| |
| * cmState: Port dependent code to new cmStateSnapshot nameStephen Kelly2016-10-1918-59/+54
| |
| * cmState: Move Snapshot type to separate namespaceStephen Kelly2016-10-192-172/+174
| | | | | | | | Leave behind a typedef to avoid porting dependent code in this commit.
| * cmState: Port dependent code to new cmStateDirectory nameStephen Kelly2016-10-1914-19/+19
| |
| * cmState: Move Directory class to separate namespaceStephen Kelly2016-10-192-115/+115
| | | | | | | | Leave behind a typedef to avoid porting dependent code in this commit.
| * cmState: Move CacheEntryType enum to separate namespaceStephen Kelly2016-10-1950-191/+211
| | | | | | | | Port dependent code to the change.
| * cmState: Move TargetType enum to separate namespaceStephen Kelly2016-10-1972-828/+855
| |
| * cmState: Move SnapshotType enum to separate namespaceStephen Kelly2016-10-182-31/+34
| |
| * cmState: Move PositionType to separate namespaceStephen Kelly2016-10-182-29/+29
| | | | | | | | Remove friend declarations supporting it being a nested type.
| * cmState: Move PolicyStackEntry to separate namespaceStephen Kelly2016-10-182-11/+12
| |
| * cmState: Move SnapshotDataType to separate namespaceStephen Kelly2016-10-182-4/+5
| |
| * cmState: Move nested struct into separate top-level namespaceStephen Kelly2016-10-182-9/+16
| | | | | | | | | | | | Add a friend declaration to give the struct access to cmState::PositionType. This will be removed when that type is also extracted.
| * cmServerProtocol: Remove unused headerStephen Kelly2016-10-181-1/+0
| |
| * cmCommandArgumentParserHelper: Remove unused headerStephen Kelly2016-10-181-1/+0
| |
* | CMake Nightly Date StampKitware Robot2016-10-201-1/+1
| |
* | Merge branch 'release'Brad King2016-10-190-0/+0
|\ \
| * | CMake 3.7.0-rc2v3.7.0-rc2Brad King2016-10-191-1/+1
| | |
* | | Merge branch 'release'Brad King2016-10-190-0/+0
|\ \ \ | |/ /
| * | Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-183-2/+5
| |\ \
| * \ \ Merge branch 'cmake-server-pipe-mode-fix' into releaseBrad King2016-10-181-6/+5
| |\ \ \
| * \ \ \ Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
| |\ \ \ \
* | \ \ \ \ Merge topic 'external-project-source-subdir-usage'Brad King2016-10-191-8/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 615f3ed2 ExternalProject: make SOURCE_SUBDIR directly appendable fdce782b ExternalProject: error out only if the property is unset
| * | | | | ExternalProject: make SOURCE_SUBDIR directly appendableBen Boeckel2016-10-181-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows it to be used in expansions without being conditional based on its value.
| * | | | | ExternalProject: error out only if the property is unsetBen Boeckel2016-10-181-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Property values may be empty; instead make sure they exist and allow for empty values.
* | | | | | Merge topic 'ExternalData-multiple-hashes'Brad King2016-10-197-19/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33a9aaa8 ExternalData: Add support for multiple hash algorithms
| * | | | | | ExternalData: Add support for multiple hash algorithmsMatt McCormick2016-10-187-19/+104
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for projects to have `Data.txt.md5` *and* `Data.txt.sha512` where the content links hold hashes for the same file. Check all `ExternalData_URL_TEMPLATES` entries in order for all available hashes. The data acquisition is considered a failure if none of the available URL resources has any of the given hashes. This makes it possible to have multiple data server resources where all servers do not support all hashing algorithms.
* | | | | | Merge topic 'fix-Android-NsightTegra'Brad King2016-10-193-2/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af881d8 Tests: Add VSNsightTegra test for VS 2015 6739d240 Tests: Fix VSNsightTegra test on Android NDK r12b 06c39612 VS: Fix NVIDIA Nsight Tegra Visual Studio Edition support
| * | | | | Tests: Add VSNsightTegra test for VS 2015Brad King2016-10-181-0/+3
| | | | | |
| * | | | | Tests: Fix VSNsightTegra test on Android NDK r12bBrad King2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test with architecture `armv7-a` instead of `armv7-a-hard` because the latter is supporte supported only with NDK revisions r9c to r11c.
| * | | | | VS: Fix NVIDIA Nsight Tegra Visual Studio Edition supportBrad King2016-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The guard added by commit v3.7.0-rc1~229^2~17 (Android: Suppress new functionality with Nsight Tegra in VS IDE builds, 2016-06-02) to `Modules/Platform/Android-Determine.cmake` does not work in that location because `CMAKE_VS_PLATFORM_NAME` is not set until after the module is loaded. Change this particular guard to test for the Visual Studio generator instead. If in the future we add support for using Visual Studio for Android without Nsight Tegra then something more will be needed, but this is good enough for now. Closes: #16371
* | | | | | Merge topic 'cmake-server-pipe-mode-fix'Brad King2016-10-191-6/+5
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | 9112c43e server-mode: Fix named pipe mode
| * | | | | server-mode: Fix named pipe modeTobias Hunger2016-10-181-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not treat a pointer itself as a `uv_stream_t`, but instead the pointed-to `uv_pipe_t`. It is unclear how this ever worked before in local testing. While at it, remove duplicate setup code and improve an error message.
* | | | | | CMake Nightly Date StampKitware Robot2016-10-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2016-10-180-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
| |\ \ \ \
| * \ \ \ \ Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-math-EXPR' into releaseBrad King2016-10-141-4/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doc-clarify-ctest-APPEND' into releaseBrad King2016-10-144-4/+12
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'timeout_after_match_testtime'Brad King2016-10-182-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 909842ff CTest: report time spent after matching output
| * | | | | | | | | CTest: report time spent after matching outputZack Galbreath2016-10-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the TIMEOUT_AFTER_MATCH test property, only report the time spent by the test after the matching output was found.
* | | | | | | | | | Merge topic 'propagate_ctest_use_launchers'Brad King2016-10-185-1/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19beee46 ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to project
| * | | | | | | | | | ctest_configure: Propagate CTEST_USE_LAUNCHERS from caller to projectBill Hoffman2016-10-175-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If `CTEST_USE_LAUNCHERS` is `TRUE` in a CTest script then the `ctest_configure` command will add `-DCTEST_USE_LAUNCHERS:BOOL=TRUE` to the cmake command used to configure the project. This allows a project to only set `CTEST_USE_LAUNCHERS` in a ctest script and have launchers work.
* | | | | | | | | | | Merge topic 'CheckFunctionExists-prototype'Brad King2016-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bc17345 CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypes
| * | | | | | | | | | | CheckFunctionExists.c: avoid gcc warnings with -Wstrict-prototypesAndre McCurdy2016-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid warnings (and therefore build failures etc) if a user happens to add -Wstrict-prototypes to CFLAGS. | $ gcc --version | gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 | | $ gcc -Wstrict-prototypes -Werror -DCHECK_FUNCTION_EXISTS=pthread_create -o foo.o -c Modules/CheckFunctionExists.c | Modules/CheckFunctionExists.c:7:3: error: function declaration isn't a prototype [-Werror=strict-prototypes] | CHECK_FUNCTION_EXISTS(); | ^ | cc1: all warnings being treated as errors | Signed-off-by: Andre McCurdy <armccurdy@gmail.com>