summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindMatlab-fix-typo' into releaseBrad King2016-10-282-3/+3
|\
| * FindMatlab: Fix typo in matlab_add_unit_test implementationMatthew Woehlke2016-10-282-3/+3
| | | | | | | | | | | | | | Fix typo in variable used to communicate between matlab_add_unit_test and its helper script MatlabTestsRedirect.cmake that was introduced in commit v3.7.0-rc1~116^2 (FindMatlab: Extend matlab_add_unit_test to run arbitrary test code, 2016-08-30).
* | Merge branch 'FindMatlab-9.1' into releaseBrad King2016-10-281-0/+1
|\ \
| * | FindMatlab: Add support for Matlab 2016b (9.1)Francesco Romano2016-10-281-0/+1
| |/
* | Merge branch 'cmake-server-handshake-improvements' into releaseBrad King2016-10-284-66/+104
|\ \
| * | server-mode: Handle generator toolset and platform in handshakeTobias Hunger2016-10-283-2/+35
| | |
| * | cmake-server: Better error reporting during handshakeTobias Hunger2016-10-272-66/+71
| | | | | | | | | | | | | | | | | | | | | Catch more problematic input during handshake and report failure. These were caught before when trying to configure, but it is way better to get these reports early.
* | | Merge branch 'intel-17-features' into releaseBrad King2016-10-261-3/+3
|\ \ \
| * | | Features: Record features for Intel C++ 17 on UNIXBrad King2016-10-261-3/+3
| | | | | | | | | | | | | | | | Issue: #16384
* | | | Merge branch 'cmake-server-message-quoting' into releaseBrad King2016-10-243-61/+61
|\ \ \ \ | | |/ / | |/| |
| * | | cmake-server: Change message wrapper to avoid ambiguity with contentBrad King2016-10-243-61/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change our message wrapper from [== CMake Server ==[ ... ]== CMake Server ==] to [== "CMake Server" ==[ ... ]== "CMake Server" ==] to guarantee that no JSON content can ever contain the ending string (because it would be encoded as `]== \"CMake Server\" ==]`).
* | | | Merge branch 'intel-compile-features-windows' into releaseBrad King2016-10-242-6/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Intel: Fix compiler extension flags on WindowsBrad King2016-10-242-6/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The extension flags enabled by commit v3.6.0-rc1~120^2~1 (Features: Record standard flags for Intel C/C++ on Windows, 2016-04-18) of the form `-Qstd=gnu++11` are not supported by the Intel C/C++ Compiler for Windows. Fall back to using the non-extension form of the flags. Issue: #16384
* | | Merge branch 'android-pic' into releaseBrad King2016-10-2415-35/+9
|\ \ \
| * | | Android: Link position-independent executables with proper flagsBrad King2016-10-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `-fPIE -pie` to the default executable link flags when `CMAKE_POSITION_INDEPENDENT_CODE` is enabled. This is required by Android 16 and above for executables to run on the device. Closes: #16382
| * | | Android: Set CMAKE_POSITION_INDEPENDENT_CODE automaticallyBrad King2016-10-2415-35/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the toolchain file or cache does not set this, enable it automatically based on the Android API version. Versions 16 and above expect position independent code. Use the main `CMAKE_POSITION_INDEPENDENT_CODE` setting in favor of hard-coding `-fpic` or `-fPIC` in the compiler flags for each ABI. This allows CMake to use `-fpie` or `-fPIE` as needed when sources are meant for executables, and `-fpic` or `-fPIC` for other sources.
* | | | Merge branch 'backport-ninja-subdir-binary-dir' into releaseBrad King2016-10-248-29/+35
|\ \ \ \
| * | | | Ninja: Use binary dir for `$subdir/all` targetsAlexis Murzeau2016-10-248-29/+35
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The targets added by commit v3.6.0-rc1~240^2~2 (Ninja: Add `$subdir/all` targets, 2016-03-11) use as `$subdir` the relative path from the top of the source tree to the current source directory. This is not correct when using `add_subdirectory(test test_bin)`. Instead we need to use the relative path from the top of the binary tree to the current binary directory as was done for related targets by commit v3.7.0-rc1~268^2 (Ninja: Add `$subdir/{test,install,package}` targets, 2016-08-05).
* | | | Merge branch 'doc-cmake-server-typos' into releaseBrad King2016-10-211-81/+48
|\ \ \ \ | | |_|/ | |/| |
| * | | Help: Fix cmake-server documentationTobias Hunger2016-10-211-81/+48
| | | | | | | | | | | | | | | | | | | | | | | | Some information was not updated to reflect the latest implementation. Reported-by: Sylvain Joubert <joubert.sy@gmail.com>
* | | | Merge branch 'android-link-exe' into releaseBrad King2016-10-214-0/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | Android: Add missing link flags for device executablesBrad King2016-10-214-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See `${ndk}/build/core/default-build-commands.mk` for link flags the NDK uses for executables. Add them to our default executable link flags. Suppress `nocopyreloc` on `arm64-v8a` because it does not work with some STL types. Closes: #16380
* | | | Merge branch 'android-armeabi-c++_static' into releaseBrad King2016-10-212-5/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Android: Fix support for armeabi with c++_staticBrad King2016-10-212-5/+2
| |/ | | | | | | | | | | | | | | Add missing "unwind" and "atomic" libraries needed for this combination. See `${ndk}/sources/cxx-stl/llvm-libc++/libs/armeabi/libc++.a` for the libraries the NDK uses. Issue: #16380
* | CMake 3.7.0-rc2v3.7.0-rc2Brad King2016-10-191-1/+1
|/
* Merge branch 'fix-Android-NsightTegra' into releaseBrad King2016-10-183-2/+5
|\
| * 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 branch 'cmake-server-pipe-mode-fix' into releaseBrad King2016-10-181-6/+5
|\ \
| * | 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.
* | | Merge branch 'external-project-source-subdir-usage' into releaseBrad King2016-10-181-8/+9
|\ \ \
| * | | 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 branch 'FindwxWidgets-unversioned-library-path' into releaseBrad King2016-10-171-12/+22
|\ \ \ \
| * | | | 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
* | | | Merge branch 'osx-no-deployment-target-on-cross-compile' into releaseBrad King2016-10-171-1/+1
|\ \ \ \
| * | | | OS X: Do not try to set deployment target when cross-compilingGregor Jasny2016-10-171-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.4.0-rc2~6^2 (Xcode: Adjust deployment target SDK version to host version, 2015-10-11) does not make sense when cross-compiling. Make it conditional to fix this regression in some cross-compiling cases. Closes: #16355
* | | | Merge branch 'doc-math-EXPR' into releaseBrad King2016-10-141-4/+5
|\ \ \ \
| * | | | Help: Fix math(EXPR) documentation formattingBrad King2016-10-141-4/+5
| |/ / /
* | | | Merge branch 'doc-clarify-ctest-APPEND' into releaseBrad King2016-10-144-4/+12
|\ \ \ \
| * | | | Help: Clarify `ctest_*` APPEND option behaviorBrad King2016-10-144-4/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | Explicitly state that this marks the `.xml` to tell the dashboard server to append it to previously submitted results and that it does not cause results to be appended to the `.xml` file.
* | | | Merge branch 'ninja-framework-POST_BUILD' into releaseBrad King2016-10-132-2/+9
|\ \ \ \
| * | | | Ninja: Fix POST_BUILD commands on macOS FrameworksBrad King2016-10-132-2/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The condition added by commit v2.8.12~179^2 (OS X: Fix regression handling frameworks for Ninja, 2013-07-16) for excluding use of versioning symlinks on macOS Frameworks must match that used for POST_BUILD selection. Otherwise we place the POST_BUILD commands after a symlink step that is never added. Closes: #16363
* | | | Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into releaseBrad King2016-10-133-6/+6
|\ \ \ \
| * | | | Honor LINK_WHAT_YOU_USE when set to OFFJamie Snape2016-10-133-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property LINK_WHAT_YOU_USE to OFF should not cause LWYU to run. Fix the property lookup to use GetPropertyAsBool.
* | | | Merge branch 'ninja-rc-regression' into releaseBrad King2016-10-131-1/+1
|\ \ \ \
| * | | | Ninja: Fix RC language depfile generation with cmcldepsBen Boeckel2016-10-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~275^2 (Ninja: Use full path for all source files, 2016-08-05), the source path was changed to use an absolute path. Inside of `cmcldeps` for `.rc` file compilation, it uses a separate argument for the path to the source file. This ended up causing `cmcldeps` to transform the following call: cmcldeps.exe RC source.rc ... C:/full/path/to/source.rc into: ... C:/full/path/to//Tc source.rc which is invalid. Update the source filename to use the full path to the source file so that the path is replaced properly.
* | | | Merge branch 'ice-3.6.3' into releaseBrad King2016-10-131-0/+1
|\ \ \ \
| * | | | FindIce: Add support for version 3.6.3Roger Leigh2016-10-131-0/+1
| |/ / /
generated by cgit v0.12 at 2025-09-14 10:06:06 (GMT)