load(qttest_p4) SOURCES += tst_qsemaphore.cpp QT = core itle>
summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check*: Added include guardsCristian Adam2017-12-0121-3/+36
|
* 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-20