summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CheckIncludeFiles-fix-src-name'Brad King2017-11-301-2/+2
|\ | | | | | | | | | | | | 3eee3301 CheckIncludeFiles: Fix name of source file used for check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1538
| * CheckIncludeFiles: Fix name of source file used for checkBrad King2017-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | In commit 7669695a74 (CheckIncludeFiles: extend to allow a LANGUAGE argument, 2017-11-08) the file name used for the check was accidentally left as `${var}.c`, where `var` is not a variable we define. It was passing tests by accidentally using just `.c` as the file name, but can break in real projects that may leave `var` defined to something else. The reference was taken from similar code in CheckTypeSize where the variable names are different. Fix our reference to be `${VARIABLE}`.
* | CMake Nightly Date StampKitware Robot2017-11-301-1/+1
| |
* | Merge topic 'check_fixtures_before_exe_existence'Craig Scott2017-11-292-3/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | fbe91dba CTest: Check failed fixture dependencies before test command and args Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !1526
| * | CTest: Check failed fixture dependencies before test command and argsCraig Scott2017-11-282-3/+11
| | |
* | | Merge branch 'release-3.10'Brad King2017-11-290-0/+0
|\ \ \
| * \ \ Merge branch 'clang-cl-fix' into release-3.10Brad King2017-11-281-3/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1522
| * \ \ \ Merge branch 'cuda-implicit-include-dirs' into release-3.10Brad King2017-11-271-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1528
* | \ \ \ \ Merge topic 'CodeBlocks-custom-compiler-id'Brad King2017-11-295-0/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e04f1d1b CodeBlocks: add option for the CB compiler ID Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1512
| * | | | | | CodeBlocks: add option for the CB compiler IDMelven Roehrig-Zoellner2017-11-275-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CodeBlocks uses his own compiler ID string which may differ from CMAKE_<LANG>_COMPILER_ID. In particular CodeBlocks supports a large number of different compiler configurations (with different IDs) This commit adds a cache variable "CMAKE_CODEBLOCKS_COMPILER_ID", so the user might adjust it when needed.
* | | | | | | Merge topic 'aix-threads'Brad King2017-11-294-19/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ff89fb6 AIX: Add -pthread flag to enable std::thread with GCC 6e613ff3 bootstrap: Add infrastructure to detect threading flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1535
| * | | | | | | AIX: Add -pthread flag to enable std::thread with GCCBrad King2017-11-284-1/+22
| | | | | | | |
| * | | | | | | bootstrap: Add infrastructure to detect threading flagsBrad King2017-11-281-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In our loop to detect -std flags, add another layer to detect threading flags.
* | | | | | | | Merge topic 'clang-cl-fix'Brad King2017-11-291-3/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f969f1a9 Clang: Do not mistake clang-cl 6.0 for GNU-like clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1522
| * | | | | | | Clang: Do not mistake clang-cl 6.0 for GNU-like clangİsmail Dönmez2017-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check added by commit v3.10.0-rc2~2^2 (Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI, 2017-10-10) is incorrectly detecting clang-cl 6.0 as GNU-like. Currently cmake is testing if the clang compiler accepts `--version` to see if it accepts GNU style flags. However, with the latest llvm snapshot this also works for clang-cl: > clang-cl --version clang version 6.0.0 (trunk) Target: x86_64-pc-windows-msvc Thread model: posix InstalledDir: C:\Program Files\LLVM\bin So instead we should use the `/?` flag which fails with clang but works with clang-cl: > clang-cl /? &> /dev/null; echo $? 0 > clang /? &> /dev/null; echo $? 1 Fixes: #17518
* | | | | | | | Merge topic 'CheckIncludeFiles-language-CXX'Brad King2017-11-2914-5/+95
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b31d5e1d CheckIncludeFiles: improve warning for missing argument 1f1c2a9f CheckIncludeFiles: clean up documentation of new features c8609992 Help: Add notes for topic 'CheckIncludeFiles-language-CXX' ea1bb902 CheckIncludeFiles: add unit tests 7669695a CheckIncludeFiles: extend to allow a LANGUAGE argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1464
| * | | | | | | CheckIncludeFiles: improve warning for missing argumentDavid Adam2017-11-242-5/+7
| | | | | | | |
| * | | | | | | CheckIncludeFiles: clean up documentation of new featuresDavid Adam2017-11-241-3/+5
| | | | | | | |
| * | | | | | | Help: Add notes for topic 'CheckIncludeFiles-language-CXX'Brad King2017-11-141-0/+6
| | | | | | | |
| * | | | | | | CheckIncludeFiles: add unit testsDavid Adam2017-11-1112-0/+54
| | | | | | | |
| * | | | | | | CheckIncludeFiles: extend to allow a LANGUAGE argumentDavid Adam2017-11-111-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows CheckIncludeFiles to work for C or C++.
* | | | | | | | Merge topic 'win-clang-debug'Brad King2017-11-291-5/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 458c589f FindBoost: Add Windows ABI tag for Clang debug 00e39a4a FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1529
| * | | | | | | | FindBoost: Add Windows ABI tag for Clang debugRoger Leigh2017-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Walter Pearce for this suggestion. Fixes: #17505
| * | | | | | | | FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compilerRoger Leigh2017-11-271-5/+2
| | | | | | | | |
* | | | | | | | | Merge topic 'cppcheck_testdriver'Brad King2017-11-291-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72d3161a TestDriver: fix style-'variableScope' cppcheck warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1518
| * | | | | | | | | TestDriver: fix style-'variableScope' cppcheck warningSylvain Joubert2017-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applied on a user project, cppcheck complains that the 'test_name' variable could have a reduced scope.
* | | | | | | | | | Merge topic 'fortran-compiler-launcher'Brad King2017-11-2913-5/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f19c70c3 Fortran: Add option to run the compiler through launcher tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1517
| * | | | | | | | | | Fortran: Add option to run the compiler through launcher toolsBrad King2017-11-2113-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Fortran_COMPILER_LAUNCHER` target property like those added for C and CXX by commit v3.4.0-rc1~450^2 (Add options to launch the compiler through tools like ccache or distcc, 2015-06-04) and CUDA by commit v3.10.0-rc1~531^2 (CUDA: Add option to run the compiler through launcher tools, 2017-06-09). Fixes: #17499
* | | | | | | | | | | Merge topic 'cuda-implicit-include-dirs'Brad King2017-11-291-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f72573a CUDA: Treat /usr/include as an implicit include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1528
| * | | | | | | | | | CUDA: Treat /usr/include as an implicit include directoryBrad King2017-11-271-0/+3
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already do this for C and C++. Fixes: #17512
* | | | | | | | | | Merge topic 'GNUInstallDirs-update-link'Brad King2017-11-291-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24e2bc42 GNUInstallDirs: Update link to 64-bit ABI documents Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1527
| * | | | | | | | | | GNUInstallDirs: Update link to 64-bit ABI documentsBrad King2017-11-271-1/+1
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suggested-by: Chris Coutinho <chrisbcoutinho@gmail.com> Fixes: #17503
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-291-1/+1
| |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-281-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'release-3.10'Brad King2017-11-270-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch 'gtest-fix-discovery' into release-3.10Brad King2017-11-215-5/+67
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | Merge-request: !1510
* | | | | | | | Merge topic 'extend-compile-language-genex'Brad King2017-11-2724-73/+86
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ae880fa Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual Studio 2b7d59f3 Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual Studio 0f6f7c8a Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with Xcode c5a82d0f Tests: Decouple COMPILE_LANGUAGE in file(GENERATE) from COMPILE_OPTIONS 25773650 Tests: Remove unnecessary result files from RunCMake.File_Generate Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Merge-request: !1511
| * | | | | | | | Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual StudioBrad King2017-11-2014-45/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc4~3^2~1 (VS: Fix target_compile_options for CUDA, 2017-06-21), the evaluation of `COMPILE_LANGUAGE` receives the proper language. The set of compile flags used for a target's C and C++ sources is based on the linker language. By default this is always the C++ flags if any C++ sources appear in the target, and otherwise the C flags. Therefore we can define the `COMPILE_LANGUAGE` generator expression in `COMPILE_OPTIONS` to match the selected language. This is not exactly the same as for other generators, but is the best VS can do. It is also sufficient for many use cases since the set of allowed flags for C and C++ is almost the same in Visual Studio. Furthermore, since the VS generator moves many of the flags to declarative `.vcxproj` elements, it will automatically avoid passing C++ flags for C sources. Issue: #17435
| * | | | | | | | Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual StudioBrad King2017-11-175-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #17435
| * | | | | | | | Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with XcodeBrad King2017-11-173-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rejecting the `COMPILE_LANGUAGE` generator expression on include directories and compile definitions with Xcode, add `file(GENERATE)` to the allowed set in the message. It is allowed and already covered by the `RunCMake.File_Generate` test `COMPILE_LANGUAGE-genex` case.
| * | | | | | | | Tests: Decouple COMPILE_LANGUAGE in file(GENERATE) from COMPILE_OPTIONSBrad King2017-11-171-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the `RunCMake.File_Generate` test `COMPILE_LANGUAGE-genex` case to avoid requiring support for the genex in `COMPILE_OPTIONS`.
| * | | | | | | | Tests: Remove unnecessary result files from RunCMake.File_GenerateBrad King2017-11-176-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default result is "0" anyway.
* | | | | | | | | Merge topic 'hardcoded-path-removal'Brad King2017-11-2726-274/+94
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a62d50ec Modules: Replace coded PATHS with PATH_SUFFIXES fd56d6a8 FindMPEG,2: Update to current libmpeg2 behavior 5f382cd8 FindPike: Update names and paths 6720807d FindAVIFile: Replace PATHS with updated suffixes f88ef9a9 Modules: Remove paths set as global Unix prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1502
| * | | | | | | | | Modules: Replace coded PATHS with PATH_SUFFIXESChristian Pfeiffer2017-11-209-109/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules assume that `/usr` and `/usr/local` are the only `CMAKE_PREFIX_PATH` entries and explicitly enumerate all paths instead of using `PATH_SUFFIXES` and relying on the dynamic set of prefix paths. This commit attempts to rectify that behavior.
| * | | | | | | | | FindMPEG,2: Update to current libmpeg2 behaviorChristian Pfeiffer2017-11-202-23/+17
| | | | | | | | | |
| * | | | | | | | | FindPike: Update names and pathsChristian Pfeiffer2017-11-201-6/+3
| | | | | | | | | |
| * | | | | | | | | FindAVIFile: Replace PATHS with updated suffixesChristian Pfeiffer2017-11-201-8/+2
| | | | | | | | | |
| * | | | | | | | | Modules: Remove paths set as global Unix prefixesChristian Pfeiffer2017-11-2013-128/+8
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes hardcoded paths that are already given in the platform files or in `UnixPath` on a global level.
* | | | | | | | | Merge topic 'iwyu-workaround'Brad King2017-11-271-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5fdbcc9 IWYU: Add more mappings for std::__decay_and_strip Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1516
| * | | | | | | | | IWYU: Add more mappings for std::__decay_and_stripBrad King2017-11-211-0/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IWYU incorrectly classifies this internal STL type as not internal, and suggests including `<type_traits>` for it. Work around the problem by mapping the offending names to a file that we always include. See include-what-you-use issue 434.
generated by cgit v0.12 at 2025-03-10 13:10:02 (GMT)