summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.14.7v3.14.7Brad King2019-09-301-1/+1
|
* Merge branch 'backport-3.14-fix-EXCLUDE_FROM_ALL-subdir-all' into release-3.14Brad King2019-09-3020-102/+170
|\ | | | | | | Merge-request: !3863
| * Help: Add release note for EXCLUDE_FROM_ALL fix in 3.14.7Brad King2019-09-301-0/+8
| |
| * Restore "all" target in subdirectories marked EXCLUDE_FROM_ALLBrad King2019-09-3017-38/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | The "all" target in each directory is supposed to have targets from that directory even if the directory itself is marked `EXCLUDE_FROM_ALL` in its parent. This was broken by commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) which made the participation of a target in "all" independent of context. Revert much of the logic change from that commit to restore the old behavior. Then re-implement the behavior intended by the commit to keep its test working. Extend the test to cover the old behavior too. Fixes: #19753
| * Tests: Clarify target names in RunCMake.add_subdirectory ExcludeFromAllBrad King2019-09-264-6/+9
| | | | | | | | | | Rename the `baz` target to `subinc` to clarify that its role is to be included even though it is in an otherwise excluded subdirectory.
| * Tests: Revise RunCMake.add_subdirectory ExcludeFromAll to avoid globbingBrad King2019-09-264-61/+43
| | | | | | | | Also simplify the clean step.
| * Tests: Teach RunCMake to support a custom working directoryBrad King2019-09-241-1/+4
|/
* CMake 3.14.6v3.14.6Brad King2019-07-161-1/+1
|
* Merge branch 'FindBISON-CMP0088-SourcePath' into release-3.14Brad King2019-07-122-3/+17
|\ | | | | | | Merge-request: !3549
| * FindBISON: Fix CMP0088 NEW behavior for non-absolute input pathsBrian Carlson2019-07-122-3/+17
| | | | | | | | | | | | | | | | Now that the working directory is in the build tree, relative input paths must be converted to an absolute path to remain relative to the source directory. Fixes: #19472
* | Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14Brad King2019-07-098-2/+167
|\ \ | | | | | | | | | Merge-request: !3532
| * | Cray: Fix include parsing when the -hlist= flag is presentChuck Atkins2019-07-098-2/+167
| |/ | | | | | | | | | | Update parsing logic from commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) to handle the quoting behavior caused by the `-hlist=` flag.
* | Merge branch 'android-pie-cmp0083' into release-3.14Brad King2019-06-192-0/+26
|\ \ | |/ |/| | | Merge-request: !3459
| * Android: ensure PIE behavior is consistent regardless CMP0083 policyMarc Chevrier2019-06-192-0/+26
|/ | | | | | | | | In commit c4b4d8b3a6 (POSITION_INDEPENDENT_CODE: Manage link flags for executables, 2018-10-02, v3.14.0-rc1~395^2) we accidentally removed our Android-specific logic for PIE under the CMP0083 OLD behavior. Restore it and also implement Android-specific logic for CMP0083 NEW behavior. Fixes: #19393
* CMake 3.14.5v3.14.5Brad King2019-05-311-1/+1
|
* Merge branch 'vs-depends-dedup' into release-3.14Brad King2019-05-302-20/+45
|\ | | | | | | Merge-request: !3388
| * VS: De-duplicate custom command dependenciesFrans van Dorsselaer2019-05-301-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid listing the same input more than once in custom commands generated in `.vcxproj` and `.csproj` files. In the case of a `.vcxproj` file additionally avoid listing the source to which the command is attached since it is already implicitly a dependency. This is a nice cleanup and also works around a VS 2019 16.1 regression in MSBuild dependency checking. Starting with that version, MSBuild now re-builds custom commands when the list of dependencies has changed. However, its check is confused by duplicate dependencies. De-duplicating them avoids this problem. Co-Author: Brad King <brad.king@kitware.com> Fixes: #19303
| * VS: Clarify name of custom commands AdditionalInputs variableFrans van Dorsselaer2019-05-302-9/+10
| |
| * VS: Isolate custom command input/output generation scopesBrad King2019-05-301-12/+16
| |
* | Merge branch 'implicit-includes-CPATH' into release-3.14Brad King2019-05-307-3/+96
|\ \ | | | | | | | | | Merge-request: !3395
| * | Do not exclude include directories made implicit by CPATHBrad King2019-05-307-3/+96
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entries of the `CPATH` environment variable are implicitly searched as include directories by some C/C++ compilers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) these entries are detected by CMake and included in the `CMAKE_{C,CXX}_IMPLICIT_INCLUDE_DIRECTORIES` variables. However, we should not exclude them from explicit specification via `-I` or particularly `-isystem` because they are meant as user-specified include directories that can be re-ordered without breaking compiler builtin headers. In particular, we need explicit requests via `include_directories` with the `SYSTEM` option to result in `-isystem` so that third-party headers do not produce warnings. Co-Author: Ben Boeckel <ben.boeckel@kitware.com> Fixes: #19291
* | Merge branch 'FindThreads-doc-c++' into release-3.14Brad King2019-05-281-3/+0
|\ \ | | | | | | | | | Merge-request: !3391
| * | FindThreads: Drop incorrect docs about usage with C++Brad King2019-05-281-3/+0
| |/ | | | | | | | | | | | | | | Drop the sentence added by commit 5a5a1d90f0 (Help: FindThreads not needed with modern C++., 2019-01-09, v3.14.0-rc1~186^2) about not needing the module with modern C++. The module is often still needed. Fixes: #19297
* | Merge branch 'FindBoost-contract-requires-compile-features' into release-3.14Brad King2019-05-241-0/+10
|\ \ | | | | | | | | | Merge-request: !3368
| * | FindBoost: Add compiler features for Boost Contract libraryAlex Turbov2019-05-241-0/+10
| |/
* | Merge branch 'libarchive-solaris-11.4' into release-3.14Brad King2019-05-211-5/+5
|\ \ | |/ |/| | | Merge-request: !3351
| * libarchive: avoid b64_encode name conflict with Solaris built-in functionBrad King2019-05-211-5/+5
|/ | | | | | | Solaris 11.4 has a built-in function named `b64_encode`. Add a `la_` prefix to our internal function to avoid conflict. Fixes: #19268
* CMake 3.14.4v3.14.4Brad King2019-05-141-1/+1
|
* Merge branch 'doc-relnotes-3.14' into release-3.14Brad King2019-05-142-0/+19
|\ | | | | | | Merge-request: !3319
| * Help: Add 3.14.4 release notesBrad King2019-05-141-0/+10
| | | | | | | | | | | | Add a note about the fix in commit 3d3713121b (target_link_libraries: Fix static library private deps in other dirs, 2019-04-30). Also reference the equivalent note already added to the 3.13.5 notes.
| * Merge branch 'doc-relnotes-3.13' into doc-relnotes-3.14Brad King2019-05-141-0/+9
| |\ |/ /
| * Help: Add 3.13.5 release notesBrad King2019-05-141-0/+9
| | | | | | | | | | Add a note about the fix in commit 3d3713121b (target_link_libraries: Fix static library private deps in other dirs, 2019-04-30).
| * Merge branch 'out-of-dir-linking-private-deps' into release-3.13Brad King2019-04-305-2/+32
| |\ | | | | | | | | | Merge-request: !3276
| * \ Merge branch 'wix-cmake-downgrade-fix' into release-3.13Brad King2019-03-121-0/+2
| |\ \ | | | | | | | | | | | | Merge-request: !3087
* | \ \ Merge branch 'swig4' into release-3.14Brad King2019-05-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3314
| * | | | FindSWIG: Support swig4.0Daniele E. Domenichelli2019-05-131-1/+1
| | | | |
* | | | | Merge branch 'ios-xctest-lookup' into release-3.14Brad King2019-05-133-0/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3309
| * | | | | Apple: Properly lookup XCTest for iOS and tvOSGregor Jasny2019-05-113-0/+37
|/ / / / / | | | | | | | | | | | | | | | Closes: #19172
* | | | | Merge branch 'touch-after-ranlib' into release-3.14Brad King2019-05-061-0/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3283
| * | | | | Apple: Preserve high resolution mtime for static librariesGregor Jasny2019-05-051-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS ranlib truncates the fractional part of the static achive file modification time. If the archive and at least one contained object file were created within the same second this will make look the archive older than the object file. On subsequent ninja runs this leads to re-achiving and updating dependent targets. As a work-around we touch the archive after ranlib. Closes: #19222
* | | | | | Merge branch 'FindPython-fix-Python_RUNTIME_LIBRARY_DIRS-variable' into ↵Brad King2019-05-061-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release-3.14 Merge-request: !3287
| * | | | | | FindPython: ensure variable Python_RUNTIME_LIBRARY_DIRS is set correctlyMarc Chevrier2019-05-051-3/+6
| | | | | | |
* | | | | | | Merge branch 'fix_ios_try_compile' into release-3.14Brad King2019-05-061-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | Merge-request: !3272
| * | | | | | iOS: Fix try_compile FILE_COPY not to failAlexandru Croitor2019-05-061-1/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building for iOS, the compiled target is placed into a bundle. If a single-configuration generator is used, like Makefiles or Ninja, the try_compile FILE_COPY behavior fails to find the bundle, because it only looks for the bundle inside a Debug subfolder (presumably to support a multi-configuration generator like Xcode). Consider looking for the bundle in the root try_compile folder, as well as in the location specified by CMAKE_TRY_COMPILE_CONFIGURATION. Closes: #19211
* | | | | | Merge branch 'FindPython-NumPy-fix-dependencies-management' into release-3.14Brad King2019-04-301-9/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3274
| * | | | | | FindPython: NumPy: fix erroneous dependencies managementMarc Chevrier2019-04-301-9/+13
| |/ / / / /
* | | | | | Merge branch 'FindBoost-fix-fiber-compiler-features' into release-3.14Brad King2019-04-301-3/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3266
| * | | | | | FindBoost: Fix compiler features for `fiber` and `context`Alex Turbov2019-04-301-0/+2
| | | | | | |
| * | | | | | FindBoost: Record compiler features for Boost 1.67 and aboveAlex Turbov2019-04-301-3/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the 1.67 upper-bound on compiler feature computation so that with newer versions we at least get it mostly right. Leave a comment with notes about updating features for future versions.
* | | | | | Merge branch 'out-of-dir-linking-private-deps' into release-3.14Brad King2019-04-305-2/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | Merge-request: !3276
View Lorry Controller Status