summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cxx-checks-tolerate-more-warnings' into release-3.11Brad King2018-04-301-0/+3
|\ | | | | | | Merge-request: !2019
| * C++ feature checks: Filter out warnings caused by local configurationBrad King2018-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | In some environments the linker produces warnings like warning: directory not found for option warning: object file compiled with -mlong-branch ... These do not affect the availability of C++ features we're checking, so filter them out. Fixes: #17850, #17947
* | Merge branch 'backport-ninja-issue-17942' into release-3.11Brad King2018-04-262-1/+9
|\ \ | | | | | | | | | Merge-request: !2010
| * | Ninja: Do not add empty custom command for file(GENERATE) outputsBrad King2018-04-262-1/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internally we mark `file(GENERATE)` outputs as `GENERATED` in order to tell custom command dependency tracing logic not to expect the files to exist on disk yet. This is because we do not generate the files until after that tracing is done. The Ninja generator also interprets the `GENERATED` property to mean that it is expected that some build rule will generate the file if another build rule depends on it. If the generator does not know of a custom command that generates the file then it adds an empty one so that the `ninja` build tool does not complain about a dependency on a file that does not exist and has no rule to generate it. However, this step is not necessary for `file(GENERATE)` outputs because there is no build rule to generate them and they will exist before `ninja` runs. Add an additional `__CMAKE_GENERATED_BY_CMAKE` property internally to tell the Ninja generator that a `GENERATED` file will exist before the build starts and is not expected to have a build rule producing it. Fixes: #17942
* | Fix CMAKE_DISABLE_SOURCE_CHANGES recognition of top of build treeMarc Chevrier2018-04-241-1/+2
|/ | | | | | | | | | | The change in commit v3.11.0-rc1~480^2 (UseJava: add_jar OUTPUT_DIR option used only for jar generation, 2017-10-12) added code of the form `file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR})`. This exposed an existing bug in `CMAKE_DISABLE_SOURCE_CHANGES` in which it does not recognize that the top of the build tree itself is in the build tree. Fix that now. Fixes: #17933
* CMake 3.11.1v3.11.1Brad King2018-04-171-1/+1
|
* Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11Brad King2018-04-134-9/+36
|\ | | | | | | Merge-request: !1959
| * Restore support for explicitly referenced CMakeLists.txt sourcesBrad King2018-04-134-9/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to target sources but instead generate references to them directly. This broke projects that explicitly specify their `CMakeLists.txt` file as a source file because the explicit entry is no longer consolidated with the generated one. Teach the relevant generators to avoid duplicating `CMakeLists.txt` source references and add test cases. Fixes: #17828
* | Merge branch 'cpack-trace-nullptr' into release-3.11Brad King2018-04-101-4/+4
|\ \ | | | | | | | | | Merge-request: !1950
| * | CPack: Fix crash on invalid generator nameBrad King2018-04-101-4/+4
| |/ | | | | | | | | | | | | | | In commit v3.11.0-rc1~68^2 (CPack: accept --trace and --trace-expand, 2017-12-09) a nullptr dereference was added that occurs when `cpack -G NotAGenerator` is invoked. Add the needed condition. Fixes: #17900
* | Merge branch 'fix-crash-trace-exp-uninit-vars' into release-3.11Brad King2018-04-092-8/+10
|\ \ | | | | | | | | | Merge-request: !1944
| * | Fix crash with --trace-expand --warn-uninitialized togetherR2RT2018-04-092-8/+10
| |/ | | | | | | | | | | | | | | Some code paths in `ExpandVariablesInString{New,Old}` were not checking the `filename` parameter for a null pointer, but this can happen when using the above flags together. Add the checks and a test case. Fixes: #17896
* | Autogen: Print moc/uic/rcc output to stdoutSebastian Holtermann2018-04-032-5/+17
| | | | | | | | | | | | | | | | The output of moc/uic/rcc used to be discarded unless the program failed. This lets moc/uic/rcc print their output to stdout even on success. Closes #17860
* | Autogen: Use std::istreambuf_iterator for file so string readingSebastian Holtermann2018-04-032-20/+34
| | | | | | | | | | | | | | This adds a dedicated mutex for file reading and writing to cmQtAutoGenerator::FileSystem. The purpose of the change is to avoid that long files reads block cmsys based path computations, which are protected by an other mutex.
* | Autogen: Protected calls to cmFilePathChecksumSebastian Holtermann2018-04-034-4/+27
| | | | | | | | | | Closes #17861 Closes #17862
* | Autogen: Protected calls to cmQtAutoGen::SubDirPrefixSebastian Holtermann2018-04-033-5/+14
| |
* | Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtensionSebastian Holtermann2018-04-033-5/+14
| |
* | Autogen: Protected calls to cmSystemTools::Split/JoinPathSebastian Holtermann2018-04-033-2/+33
| |
* | Autogen: Protected calls to cmSystemTools::CollapseCombinedPathSebastian Holtermann2018-04-033-7/+24
|/
* CMake 3.11.0v3.11.0Brad King2018-03-281-1/+1
|
* Merge branch 'ctest_update-memory-problems' into release-3.11Brad King2018-03-272-7/+10
|\ | | | | | | Merge-request: !1893
| * ctest_update: Fix crash when handling svn externalsBrad King2018-03-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.9.0-rc1~156^2 (c++: prefer vectors over lists, 2017-05-04) switched `cmCTestSVN::Repositories` from `std::list` to `std::vector`. This can cause re-allocation when svn externals are processed and break the `RootInfo` pointer that is supposed to point at the first repository element. Switch back to `std::list` so that the address remains stable. Fixes: #17854
| * cmSystemTools: Fix ParseArguments out-of-bounds readBrad King2018-03-271-6/+7
| | | | | | | | | | | | | | When checking for a Windows-style leading path, do not read past the null terminator. Issue: #17854
* | Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"Brad King2018-03-261-7/+4
|/ | | | | | | | | | | | | Revert commit v3.8.0-rc1~305^2 (Remove CTestTestfile.cmake when BUILD_TESTING is OFF, 2016-11-14) again. We reverted it once in commit v3.8.0-rc3~22^2 (Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF", 2017-03-06) but it was accidentally restored by commit v3.11.0-rc1~387^2 (server: add "ctestInfo" request to get test info, 2017-10-25), perhaps due to conflict resolution during rebase. We cannot remove `CTestTestfile.cmake` when testing is off because it breaks projects that never enable testing but create their own `CTestTestfile.cmake` manually instead. Revert the change again and add a test case.
* CMake 3.11.0-rc4v3.11.0-rc4Brad King2018-03-191-1/+1
|
* Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11Brad King2018-03-138-24/+40
|\ | | | | | | Merge-request: !1844
| * Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-123-9/+18
| | | | | | | | | | | | | | | | When evaluating include directories during export to a `try_compile` test project, thread the compile language through to the generator expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`. Issue: #17811
| * Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-125-15/+22
| | | | | | | | | | | | | | | | | | When evaluating `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`, or evaluating `INTERFACE_INCLUDE_DIRECTORIES` on an imported target, thread the compile language through to the generator expression evaluator so that it can support `$<COMPILE_LANGUAGE:...>`. Fixes: #17811
* | Merge branch 'ccmake-stack-smashing' into release-3.11Brad King2018-03-131-1/+1
|\ \ | |/ |/| | | Merge-request: !1836
| * ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | | | | | | | | | A mistyped length calculation will memset across stack frame when the user's terminal width is larger than 270.
| * CMake 3.10.2v3.10.2Brad King2018-01-181-1/+1
| |
| * Merge branch 'backport-autogen-nexist-source-fix' into release-3.10Brad King2018-01-101-5/+17
| |\ | | | | | | | | | Merge-request: !1650
| | * Autogen: Ignore not existing source files in cmMakefileSebastian Holtermann2018-01-101-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until CMake 3.10 a list of source files that had the AUTOUIC_OPTIONS property populated was kept in `cmMakefile::QtUiFilesWithOptions`. In the process to remove all AUTOUIC related code from `cmMakefile` for CMake 3.10, the pre filtered list was replaced by a loop in `cmQtAutoGeneratorInitializer` over all source files in the `cmMakefile`. This loop introduced the problem that file paths were computed for source files that weren't in the target's sources and that might not even have existed. If the path for an unused and not existing file was computed a `cmake::FATAL_ERROR` with the error message "Cannot find source file:" was thrown nevertheless. This caused some projects to fail in CMake 3.10. This patch adds a test for path errors in the loops in `cmQtAutoGeneratorInitializer` that iterate over all source files in a `cmMakefile`. If a path error appears, the file is silently ignored. If the file is part of the target's sources, the path error will still be caught in the loop over all the target's sources. This is the fix for CMake 3.10.1.
| * | Merge branch 'backport-autogen-nested-lists-fix' into release-3.10Brad King2017-12-202-1/+4
| |\ \ | | | | | | | | | | | | Merge-request: !1606
| | * | Autogen: Fix for problematic nested list separatorSebastian Holtermann2017-12-202-1/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AutogenInfo.cmake file the separator for nested lists was `@LSEP@` which led to a speed regression because the `@` character triggered an (unsuccessful) expression evaluation. By setting the policy version of the CMake instance in the `_autogen` target to 3.9, the OLD `@` evaluating behavior controlled by policy CMP0053 is disabled. Also the nested lists separator string is changed to `<<<S>>>`, which solves the problem twofold. Issue: #17570
* | | CMake 3.11.0-rc3v3.11.0-rc3Brad King2018-03-091-1/+1
| | |
* | | Merge branch 'update-kwsys' into release-3.11Brad King2018-03-074-16/+25
|\ \ \ | | | | | | | | | | | | Merge-request: !1830
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-03-074-16/+25
| | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-03-07 (2ad561e7)
* | | | Autogen: Check if a file is empty before reading itSebastian Holtermann2018-03-061-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `std::string::front()` on an empty string results in an undefined behavior by the C++ standard. In gcc8 it causes an assertion to fail. This adds a check to `AUTOGEN` if a file to read is empty and in case avoids the use of an empty `std::string` buffer. Closes #17793
* | | | CMake 3.11.0-rc2v3.11.0-rc2Brad King2018-02-271-1/+1
| | | |
* | | | Merge branch '14297-partial-xcode-zero-check' into release-3.11Brad King2018-02-231-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1790
| * | | | Xcode: Generate ZERO_CHECK generator target only onceGregor Jasny2018-02-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled generate only the root-level ZERO_CHECK target so targets in subdirectories pick up the root generator target of ZERO_CHECK. For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not enabled more investigation and a proper and final fix is still needed. Issue: 14297
* | | | | Merge branch 'std-thread-link' into release-3.11Brad King2018-02-221-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Merge-request: !1789
| * | | | CMakeLib: Link to system thread libraries to support std::threadBrad King2018-02-221-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some environments require linking to thread libraries for `std::thread`. Express this direct dependency of CMakeLib explicitly. Previously this was done indirectly through our bundled libuv, but that does not work when using a system libuv. Fixes: #17757
* | | | Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-151-12/+16
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1766
| * | | | Android.mk: Fix export of static libraries with PRIVATE dependenciesBrad King2018-02-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `LINK_ONLY` generator expression is used to represent private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` property value. Fix evaluation of generator expressions during export to support the `LINK_ONLY` genex. Extend the RunCMake.AndroidMK test with a case for this.
| * | | | Android.mk: Evaluate generator expressions up frontBrad King2018-02-141-12/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator expressions first, before expanding the `;` list, in case they contain or generate semicolons.
* | | | Merge branch 'autogen-write-on-change-only' into release-3.11Brad King2018-02-131-34/+12
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1753
| * | | | Autogen: Overwrite info files when changed onlySebastian Holtermann2018-02-061-34/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | Check if the content of the AUTOMOC/UIC/RCC info file will change before overwriting it. This avoids unnecessary AUTORCC rebuilds when AUTORCC unrelated CMake settings change.
* | | | Merge branch '17711-reset-xcode-target-var' into release-3.11Brad King2018-02-131-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1757
generated by cgit v0.12 at 2025-01-06 23:23:03 (GMT)