summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID variableNorbert Lange2017-06-2911-0/+44
| | | | | | | | | | Compilers such as MSVC and IAR may have variants that target different architectures. We have been using a `MSVC_<LANG>_ARCHITECTURE_ID` variable to hold this information for MSVC. Add an alternative with a more general name (later we can port MSVC to it too). This additional information may be needed to generate proper invocations of the compiler based on its architecture variant.
* Store CMAKE_ASM_COMPILER_VERSION persistentlyNorbert Lange2017-06-292-13/+31
| | | | We already do this for other languages like C and CXX.
* CMakeDetermineASMCompiler: Fix small copy-paste mistakeNorbert Lange2017-06-291-1/+1
| | | | GNU is not a vendor of IAR.
* Add infrastructure to use language extensions without any standardBrad King2017-06-291-0/+10
| | | | | | | | | | When `<LANG>_STANDARD` is not set we will not add any language standard flags. If `<LANG>_EXTENSIONS` is not OFF then our default is supposed to be ON. In order to support compilers that do not enable their extensions by default, check a `CMAKE_<LANG>_EXTENSION_COMPILE_OPTION` variable for an extensions flag to use without any language standard. Suggested-by: Norbert Lange <nolange79@gmail.com>
* cmLocalGenerator: Switch order of <LANG>_{EXTENSIONS,STANDARD} checkBrad King2017-06-291-5/+5
|
* cmLocalGenerator: Simplify logic for language standard or extension flagBrad King2017-06-291-2/+2
|
* CMake Nightly Date StampKitware Robot2017-06-261-1/+1
|
* CMake Nightly Date StampKitware Robot2017-06-251-1/+1
|
* CMake Nightly Date StampKitware Robot2017-06-241-1/+1
|
* CMake Nightly Date StampKitware Robot2017-06-231-1/+1
|
* Merge topic 'doc-dev-maint'Brad King2017-06-221-0/+2
|\ | | | | | | | | | | | | 420e4844 Help/dev: Update maintainer guide with note about docs and tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1000
| * Help/dev: Update maintainer guide with note about docs and testsBrad King2017-06-221-0/+2
| |
* | Merge branch 'release-3.9'Brad King2017-06-220-0/+0
|\ \ | |/ |/|
| * CMake 3.9.0-rc4v3.9.0-rc4Brad King2017-06-221-1/+1
| |
* | Merge branch 'release-3.9'Brad King2017-06-220-0/+0
|\ \ | |/
| * Merge branch 'vs-rc-flags' into release-3.9Brad King2017-06-225-0/+8
| |\
| * \ Merge branch 'android-unified-headers' into release-3.9Brad King2017-06-221-2/+6
| |\ \
| * \ \ Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-214-10/+44
| |\ \ \
| * \ \ \ Merge branch 'vs_csharp_link_to_managed_cxx' into release-3.9Brad King2017-06-216-4/+54
| |\ \ \ \
* | \ \ \ \ Merge topic 'vs-rc-flags'Brad King2017-06-225-0/+8
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 974f4333 VS: Fix support for rc /nologo flag in per-source COMPILE_FLAGS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !998
| * | | | | 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 topic 'android-unified-headers'Brad King2017-06-221-2/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d317930 Android: Fix include path for unified headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !997
| * | | | | 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 topic 'vs-cuda-fix-flags'Brad King2017-06-224-10/+44
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b754215 VS: Improve workaround for CUDA -Xcompiler placement bug f2059585 VS: Fix target_compile_options for CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !996
| * | | | | 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 topic 'cuda-macos-rpath-in-tests'Brad King2017-06-227-23/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fff782f6 Tests: Simplify CUDA rpath on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !995
| * | | | | Tests: Simplify CUDA rpath on macOSBrad King2017-06-217-23/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the `BUILD_RPATH` property and reference the CMake-computed location of the runtime libraries.
* | | | | | Merge topic 'vs_fix_configuration_error'Brad King2017-06-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0db4c7a0 Tests: Verify registry value is not "/registry" before using Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !994
| * | | | | | Tests: Verify registry value is not "/registry" before usingMichael Stürmer2017-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17002
* | | | | | | Merge topic 'vs_csharp_link_to_managed_cxx'Brad King2017-06-226-4/+54
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51865fc6 Vs: allow CSharp targets to be linked to CXX targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !993
| * | | | | | Vs: allow CSharp targets to be linked to CXX targetsMichael Stürmer2017-06-216-4/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16755
* | | | | | | CMake Nightly Date StampKitware Robot2017-06-221-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release-3.9'Brad King2017-06-210-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'cuda-version-for-vs' into release-3.9Brad King2017-06-201-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'update-expat' into release-3.9Brad King2017-06-2011-171/+910
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'autogen_brace'Brad King2017-06-217-11/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50b3837c Autogen: Q_OBJECT behind brace test 01d2b745 Autogen: Check for Q_OBJECT/Q_GADGET after brace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !986
| * | | | | | | Autogen: Q_OBJECT behind brace testSebastian Holtermann2017-06-206-9/+65
| | | | | | | |
| * | | | | | | Autogen: Check for Q_OBJECT/Q_GADGET after braceSebastian Holtermann2017-06-201-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #16971
* | | | | | | | Merge topic 'CheckTypeSize-arm-archs'Brad King2017-06-211-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72ccb9f4 CheckTypeSize: Add support for arm architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !989
| * | | | | | | | CheckTypeSize: Add support for arm architecturesDouglas McKenzie2017-06-201-0/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds detection for `armv7`, `armv7s` and `arm64` when performing type size checks on universal binaries for iOS. Fixes: #16992
* | | | | | | | Merge topic 'cuda-version-for-vs'Brad King2017-06-211-0/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f94213a1 Help: Update 3.9 release notes with recommended CUDA version for VS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !990
| * | | | | | | 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 topic 'update-expat'Brad King2017-06-2111-171/+910
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5afb178 expat: Fix compilation on systems without stdint.h 0a40c668 Merge branch 'upstream-expat' into update-expat 4b8a8c22 expat 2017-06-17 (c4446687) d9d191a1 expat: Update script to get Expat 2.2.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !987
| * | | | | | 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
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-06-211-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'FindICU-data-vars'Brad King2017-06-201-24/+68
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3566af83 FindICU: Search for packaged data files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !981