summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | target_link_libraries: Fix static library private deps in other dirsBrad King2019-04-305-2/+32
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a1ad0a699b (target_link_libraries: Allow use with targets in other directories, 2018-09-07, v3.13.0-rc1~94^2) we accidentally broke the logic that adds `$<LINK_ONLY:...>` to private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` in the case that the dependency is added from outside the directory creating the library. The check for a valid target name should apply to the original name specified by the caller and not the encoded cross-directory reference. Fixes: #19197
* | | | CMake 3.14.3v3.14.3Brad King2019-04-221-1/+1
| | | |
* | | | Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3254
| * | | | FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | | | | Merge branch 'vs-default-platform' into release-3.14Brad King2019-04-1910-3/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3246
| * | | | | VS: Provide the default platform name to project codeBrad King2019-04-1910-3/+40
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio generators based on `CMAKE_GENERATOR_PLATFORM` or some default. Prior to the VS 2019 generator, the default was always `Win32`. However, for the `Visual Studio 16 2019` generator, the default is based on the host platform. Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for use by project code. This is particularly useful in toolchain files because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so `CMAKE_VS_PLATFORM_NAME` is not yet known. Of course the toolchain file author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that will be used. Fixes: #19177
* | | | | Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14Brad King2019-04-171-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3236
| * | | | | FindOpenGL: look for GLVND libraries with a libglvnd suffixBen Boeckel2019-04-171-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | On CentOS 6.10, the libglvnd package from EPEL installs its libraries under a libglvnd subdirectory.
* | | | | Merge branch 'Boost-Gentoo' into release-3.14Brad King2019-04-163-1/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3237
| * | | | | FindBoost: Fix detection with version suffixes on GentooRolf Eike Beer2019-04-163-1/+31
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gentoo case added by commit 1673923c30 (FindBoost: Add support for Boost 1.67 with Python version suffixes, 2018-03-18, v3.11.0~3^2) left out the `.` version component separator and instead duplicated the RPM case. Add the missing `.` now. Fixes: #18743
* | | | | Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-151-2/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | Merge-request: !3233
| * | | | IRSL: Update redist directory for VS 2019 update 1Brad King2019-04-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2019 Update 1 will fix its redist directories to be named `VC142` instead of `VC141`. It will also use cl `19.21` instead of `19.20` so we can use that to distinguish the versions. Fixes: #19131
* | | | | Merge branch 'backport-FindBoost-msvc-toolset-14.2' into release-3.14Brad King2019-04-121-5/+20
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | Merge-request: !3221
| * | | | FindBoost: Add support for MSVC toolset version 14.2Brad King2019-04-121-5/+20
|/ / / / | | | | | | | | | | | | Generalize the logic to express compatibility among 14.x versions.
* | | | CMake 3.14.2v3.14.2Brad King2019-04-121-1/+1
| | | |
View Lorry Controller Status