summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Add internal API for detecting "managed" projectsMichael Stürmer2016-10-192-0/+6
| | | | | This is in preparation for adding CSharp language support to the VS generator.
* VS: Add CSharp project uuid and file extensionMichael Stürmer2016-10-193-0/+28
| | | | | This is in preparation for adding CSharp language support to the VS generator.
* 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>
* | | | | | | | | | | | Merge topic 'math-EXPR-unary'Brad King2016-10-185-862/+1165
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2810e561 math(EXPR): Add support for unary `+` and `-` expressions 834f52a6 cmExprParser: Revise indentation style to match rest of CMake 7aaed265 cmExprParser: Port to bison 3
| * | | | | | | | | | | | math(EXPR): Add support for unary `+` and `-` expressionsBrad King2016-10-144-57/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: #8996
| * | | | | | | | | | | | cmExprParser: Revise indentation style to match rest of CMakeBrad King2016-10-142-115/+155
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmExprParser: Port to bison 3Brad King2016-10-143-792/+1010
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %-directives to specify the scanner/lexer arguments and update the yyerror signature. Reduce the list of post-bison modifications needed.
* | | | | | | | | | | | Merge topic 'FindwxWidgets-unversioned-library-path'Brad King2016-10-181-12/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52e8fa23 FindwxWidgets: Fix finding unversioned VS-built directory prefixes
| * | | | | | | | | | | FindwxWidgets: Fix finding unversioned VS-built directory prefixesBrad King2016-10-171-12/+22
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.7.0-rc1~217^2 (FindwxWidgets: Add VS-versioned library directory prefixes, 2016-08-24) works only for official wxWidgets builds that add the VS-versioned directory prefixes. Local wxWidgets builds still have an unversioned prefix. Search them. Closes: #16366
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2016-10-181-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'extract-computed-target-properties'Brad King2016-10-1712-291/+493
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cef59bb8 cmTarget: Implement GetProperty in terms of cmState::Snapshot 0d57b07a cmTarget: Group code for checking written properties together c3fb0d95 cmTarget: Move sanity checks and computed property access to callers fa9dbc56 cmGeneratorTarget: Implement cmTargetPropertyComputer interface 848ae2a6 cmTargetPropertyComputer: Template some methods on the Target a0a720e6 cm{,Generator}Target: Add global generator accessors 637e3f3e cmTargetPropertyComputer: Unify whitelist handling from cmTarget 05251e6d cmTargetPropertyComputer: Move whitelist check from cmTarget fbf1721c cmTargetPropertyComputer: Extract into new files 390a7d86 cmTargetPropertyComputer: Implement GetProperty without cmMakefile e32a6bdd cmListFileBacktrace: Add a method to retrieve the Bottom of a snapshot 7863fba1 cmTarget: Extract GetLocation method 8096682e cmTarget: Extract GetSources method 7d57c1a2 cmTarget: Extract location computation methods a55cac4b cmTarget: Split property computation into separate class 705fcf52 cmTarget: Move IMPORTED check to callers ...
| * | | | | | | | | | cmTarget: Implement GetProperty in terms of cmState::SnapshotStephen Kelly2016-10-161-3/+10
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Group code for checking written properties togetherStephen Kelly2016-10-161-25/+25
| | | | | | | | | | |
| * | | | | | | | | | cmTarget: Move sanity checks and computed property access to callersStephen Kelly2016-10-166-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GetProperty method is now just accessing contained data, meaning it can be implemented in cmState. Remove the cmMakefile context from the signature as a result and remove the overload with the same signature. Add a GetComputedProperty to cmTarget so that templates can be properly instantiated. Otherwise the Commands would need to be able to reach the specializations which are currently in cmTarget.cxx. As a side-effect, the CMP0026 warning now gives a backtrace to the target when issued from a generator expression.
| * | | | | | | | | | cmGeneratorTarget: Implement cmTargetPropertyComputer interfaceStephen Kelly2016-10-152-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate a local member for the sources property when the instance is created. Pass the parameter to avoid the policy check when doing so. Ordinarily, the GetSources function should not be called unconditionally (at generate time), but we need to do so here in case the property is read in a generator expression. The intent is to be able to implement cmGeneratorTarget without requiring cmTarget.
| * | | | | | | | | | cmTargetPropertyComputer: Template some methods on the TargetStephen Kelly2016-10-153-199/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the methods for cmTarget in the cmTarget source.
| * | | | | | | | | | cm{,Generator}Target: Add global generator accessorsStephen Kelly2016-10-154-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide 'static polymorphism' between the types in this aspect so that they can be used indiscriminately in a C++ template.
| * | | | | | | | | | cmTargetPropertyComputer: Unify whitelist handling from cmTargetStephen Kelly2016-10-153-21/+29
| | | | | | | | | | |
| * | | | | | | | | | cmTargetPropertyComputer: Move whitelist check from cmTargetStephen Kelly2016-10-153-35/+37
| | | | | | | | | | |
| * | | | | | | | | | cmTargetPropertyComputer: Extract into new filesStephen Kelly2016-10-155-245/+290
| | | | | | | | | | |
| * | | | | | | | | | cmTargetPropertyComputer: Implement GetProperty without cmMakefileStephen Kelly2016-10-151-24/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only a cmMessenger and a backtrace are needed.
| * | | | | | | | | | cmListFileBacktrace: Add a method to retrieve the Bottom of a snapshotStephen Kelly2016-10-151-0/+2
| | | | | | | | | | |