summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GCC,Clang: Mark CMAKE_<LANG>_COMPILER_{AR,RANLIB} as advancedBrad King2017-06-222-0/+4
|
* CMake 3.9.0-rc4v3.9.0-rc4Brad King2017-06-221-1/+1
|
* Merge branch 'vs-rc-flags' into release-3.9Brad King2017-06-225-0/+8
|\
| * VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGSBrad King2017-06-225-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~160^2 (VS: Use tool-specific flag table for COMPILE_FLAGS parsing, 2017-05-03) we now correctly use the `rc` flag table to process the COMPILE_FLAGS flags of `.rc` source files instead of incorrectly using the `cl` flag table as before. However, our `rc` flag table is not complete. The `/nologo` flag was working before only by accident because the `cl` flag table entry for it happened to match. Add the proper entry to the `rc` flag table. Fixes: #16991
* | Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-221-2/+6
|\ \
| * | Android: Fix include path for unified headersBrad King2017-06-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc3~3^2 (Android: Add support for unified headers, 2017-06-12) we accidentally constructed the unified header include directories from the linking sysroot. Construct them from the compiling sysroot instead. Fixes: #16584
* | | Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-214-10/+44
|\ \ \
| * | | VS: Improve workaround for CUDA -Xcompiler placement bugBrad King2017-06-212-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.9.0-rc1~431^2~6 (VS: Place CUDA host compiler options in proper project file fields, 2017-03-07) we worked around a bug in the CUDA VS integration by dropping `AdditionalCompilerOptions`. However, this silently drops `-Xcompiler=` options given by the user that don't map to one of CudaCompile's dedicated settings. Improve the workaround to instead put the remaining `AdditionalCompilerOptions` into the `AdditionalOptions` field behind `-Xcompiler=` ourselves.
| * | | VS: Fix target_compile_options for CUDABrad King2017-06-213-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the VS generator to honor `COMPILE_OPTIONS` for CUDA. The exclusion added by commit v3.9.0-rc1~431^2~7 (VS: Do not pass CUDA compile options to C compiler, 2017-03-07) was correct but we need additional logic to pass the CUDA compile options to the CUDA compiler. Also we should still pass the CXX or C options to MSVC (ClCompile) when those languages are enabled even if the link language is CUDA.
* | | | Merge branch 'vs_csharp_link_to_managed_cxx' into release-3.9Brad King2017-06-216-4/+54
|\ \ \ \ | |/ / / |/| | |
| * | | Vs: allow CSharp targets to be linked to CXX targetsMichael Stürmer2017-06-216-4/+54
| | | | | | | | | | | | | | | | Fixes: #16755
* | | | Merge branch 'cuda-version-for-vs' into release-3.9Brad King2017-06-201-0/+2
|\ \ \ \
| * | | | Help: Update 3.9 release notes with recommended CUDA version for VSBrad King2017-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA 8.0.44 contains a bug in its VS integration that breaks preprocessor definitions in some cases. Recommend using at least 8.0.61 which fixes the problem. Fixes: #16993
* | | | | Merge branch 'update-expat' into release-3.9Brad King2017-06-2011-171/+910
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | expat: Fix compilation on systems without stdint.hBrad King2017-06-201-1/+11
| | | | |
| * | | | Merge branch 'upstream-expat' into update-expatBrad King2017-06-1910-169/+897
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-expat: expat 2017-06-17 (c4446687)
| | * | | | expat 2017-06-17 (c4446687)Expat Upstream2017-06-1911-186/+928
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libexpat/libexpat.git at commit c4446687cfc6c5fd7f6371aeaf24c69402a3589e (R_2_2_1).
| * | | | | expat: Update script to get Expat 2.2.1Brad King2017-06-191-2/+3
| | | | | |
* | | | | | Merge branch 'doc-compile-features' into release-3.9Brad King2017-06-152-4/+4
|\ \ \ \ \ \
| * | | | | | Help: Document that VS 2017 compile features are recordedBrad King2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were recorded by commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). Fixes: #16974
| * | | | | | Help: Fix typo in Cray/PGI/XL compile features docsBrad King2017-06-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | | Merge branch 'ipo-per-lang' into release-3.9Brad King2017-06-1422-52/+62
|\ \ \ \ \ \ \
| * | | | | | | IPO: Consider support for each language separatelyBrad King2017-06-1422-52/+62
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only define `INTERPROCEDURAL_OPTIMIZATION` behavior for C, CXX, and Fortran languages. Do not try to enable support for other languages. Furthermore, each language builds with a different compiler, so check for support by CMake and the compiler for each language independently. Fixes: #16944
* | | | | | | Merge branch 'update-curl' into release-3.9Brad King2017-06-1471-1043/+1515
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2017-06-1470-1042/+1514
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-06-14 (54b636f1) Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt` by disabling CA bundle/path detection for build within CMake. CMake already handles locating a CA bundle/path at runtime.
| | * | | | | | | curl 2017-06-14 (54b636f1)Curl Upstream2017-06-1471-1048/+1517
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 54b636f14546d3fde9f9c67c3b32701d78563161 (curl-7_54_1).
| * | | | | | | | curl: Update script to get curl 7.54.1Brad King2017-06-141-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'libuv-restore-fmode' into release-3.9Brad King2017-06-141-0/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | cmake: Fix default file translate mode when using libuvBrad King2017-06-141-0/+16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, libuv's one-time initialization changes the C runtime library's `_fmode` setting to `_O_BINARY`, thus causing files to open as binary after that instead of the default `_O_TEXT` mode. See upstream libuv issue 840. Work around the problem by performing libuv initialization early and then restoring `_fmode`. In particular, this currently affects server mode. Without this fix, the `_fmode` setting changes when the server mode initializes libuv. Fixes: #16962
* | | | | | | | Merge branch 'add-missing-compiler-release-notes' into release-3.9Brad King2017-06-142-1/+22
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Help: Add docs for new compilers supporting language standards.Chuck Atkins2017-06-142-1/+22
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'readme-supported-platforms' into release-3.9Brad King2017-06-131-1/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | README: Update list of supported platformsBrad King2017-06-131-1/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Convert to a bullet list. Drop platforms for which we no longer have nightly testing.
* | | | | | CMake 3.9.0-rc3v3.9.0-rc3Brad King2017-06-131-1/+1
| | | | | |
* | | | | | Merge branch 'cuda-dlink-no-deprecated-gpu' into release-3.9Brad King2017-06-133-4/+28
|\ \ \ \ \ \
| * | | | | | CUDA: When linking device code suppress CUDA 8.0+ deprecation warningsRobert Maynard2017-06-133-4/+28
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA compiler automatic deprecation warnings are pure noise when doing device linking, and should be suppressed to reduce the amount of confusion from users.
* | | | | | Merge branch 'doc-pkgconfig-list' into release-3.9Brad King2017-06-121-1/+7
|\ \ \ \ \ \
| * | | | | | FindPkgConfig: mention that variables will be ;-listsRolf Eike Beer2017-06-121-0/+6
| | | | | | |
| * | | | | | FindPkgConfig: fix confusing indentationRolf Eike Beer2017-06-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-128-16/+72
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Android: Add support for unified headersBrad King2017-06-128-16/+72
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unified headers are preferred as of NDK r15, so use them by default if available and provide an option to use the deprecated headers. Inspired-by: Florent Castelli <florent.castelli@gmail.com> Fixes: #16584
* | | | | Merge branch 'android-standalone-no-sysroot-include' into release-3.9Brad King2017-06-091-2/+7
|\ \ \ \ \
| * | | | | Android: Do not pass sysroot include for standalone toolchainBrad King2017-06-091-2/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory explicitly, 2017-01-20) does not make sense when compiling with a standalone toolchain which is tied to a single API version. Drop the explicit include directory so that the compiler uses its default system include order. Fixes: #16954
* | | | | Merge branch 'android-standalone-unified-api-level' into release-3.9Brad King2017-06-091-5/+28
|\ \ \ \ \
| * | | | | Android: Detect API version of standalone toolchain with unified headersBrad King2017-06-091-5/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A standalone toolchain with unified headers keeps the `__ANDROID_API__` macro in the `bin/clang` launcher instead of in `api-level.h`. Issue: #16954
* | | | | Merge branch 'FindDoxygen-imported-target-once' into release-3.9Brad King2017-06-091-16/+24
|\ \ \ \ \
| * | | | | FindDoxygen: Create imported targets at most once in a given scopeBrad King2017-06-091-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imported targets added by commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) need to be guarded against duplicate creation on multiple inclusion.
* | | | | | Merge branch 'improve-msvc-feature-checks' into release-3.9Brad King2017-06-081-1/+3
|\ \ \ \ \ \
| * | | | | | C++ feature checks: Improve exclusion of "0 Warning(s)"Brad King2017-06-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply matching "0 Warning" may match "10 Warning(s)". Instead remove the entire ` 0 Warning(s)` content from the MSBuild output before searching it for warnings. Issue: #16942
* | | | | | | CMake 3.9.0-rc2v3.9.0-rc2Brad King2017-06-071-1/+1
| | | | | | |