summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULLIan Hojnicki2017-06-282-0/+11
|
* VS: Fix GenerateDebugInformation values for v140 and v141 toolsetsBrad King2017-06-285-30/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When VS 2015 was first released, its new v140 toolset came with a `link.xml` file that changed the `GenerateDebugInformation` boolean (`false` and `true`) value from earlier toolsets to an enumeration consisting of the possible values `No`, `Debug`, and `DebugFastLink`. We first adapted to this in commit v3.4.2~2^2 (VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation, 2016-01-08), but that broke older toolsets that still expected the boolean. Then commit v3.6.0-rc1~295^2~1 (VS: Fix VS 2015 .vcxproj debug setting for older toolsets, 2016-02-24) added a hack to fix up the value based on the toolset in use. Several follow-up commits fixed this for more older toolsets because our flag table was at the time based on the generator in use rather than the toolset in use. Since commit v3.8.0-rc1~396^2 (VS: Choose flag map based on the toolset name, 2016-10-17) we use a flag table based on the toolset, so the fixup hack should not be needed. We had to keep it around only due to our default value for GenerateDebugInformation (`false` or `No`) still being based on the generator instead of the toolset. A VS 2015 update was released that changed the v140 toolset `link.xml` file back to using `false` and `true` for the `GenerateDebugInformation` enumeration variants previously known as `No` and `Debug`. In order to know which pair to use, we need to parse the `link.xml` file for the current toolset. Switch back to using `false` and `true` unconditionally in our `GenerateDebugInformation` flag table entries and default value. With that plus the toolset-based flag table, we now get incorrect values for `GenerateDebugInformation` only when using a v140 toolset from an older VS 2015 installation. Detect this case by parsing `link.xml` and add special logic to convert `false` and `true` to `No` and `Debug` to satisfy the older toolset specification. Inspired-by: Ian Hojnicki <nullref@live.com> Fixes: #17020
* VS: Fix GenerateDebugInformation flag map text for v141 toolsetsIan Hojnicki2017-06-281-2/+2
| | | | Update the help text to match that from v141's link.xml file.
* VS: Split link flag table between v140 and v141 toolsetsIan Hojnicki2017-06-285-6/+291
|
* CMake 3.9.0-rc5v3.9.0-rc5Brad King2017-06-271-1/+1
|
* Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
|\
| * FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
| | | | | | | | | | | | Since commit v3.9.0-rc1~55^2 (Improve Doxygen support, 2017-04-10) we accidentally leave a non-prefixed internal `result` variable set. This may interfere with project code. Add a prefix to avoid this.
* | Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9Brad King2017-06-2727-14/+49
|\ \
| * | target_compile_features: Do not crash on non-enabled languageBrad King2017-06-265-2/+27
| | | | | | | | | | | | Fixes: #17011
| * | Tests: Enable languages explicitly in RunCMake.target_compile_featuresBrad King2017-06-2622-12/+22
| | | | | | | | | | | | | | | Enable C or CXX (or nothing) as needed in each test case. This will allow us to add test cases that do not enable CXX.
* | | Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-272-3/+8
|\ \ \
| * | | VS: Fix support for nvcc flags not in our flag tableBrad King2017-06-272-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.9.0-rc4~3^2 (VS: Improve workaround for CUDA -Xcompiler placement bug, 2017-06-21) accidentally appended to the `AdditionalOptions` as if it were a `;`-separated list, but it is actually a command-line string. Append with a space instead. While at it, fix the same problem for the `AdditionalOptions` added to `CudaLink` by commit v3.9.0-rc3~1^2 (CUDA: When linking device code suppress CUDA 8.0+ deprecation warnings, 2017-06-09). Fixes: #17008
* | | | Merge branch 'GetPrerequisites-ucrt-no-warn' into release-3.9Brad King2017-06-261-1/+1
|\ \ \ \
| * | | | GetPrerequisites: Do not warn about non-absolute UCRT system librariesBrad King2017-06-261-1/+1
| | |/ / | |/| | | | | | | | | | Issue: #17007
* | | | Merge branch 'toolchain-binutils-advanced' into release-3.9Brad King2017-06-222-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ \ \ \ \ \
generated by cgit v0.12 at 2025-02-10 05:22:57 (GMT)