summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindBoost-link-threads' into release-3.13Brad King2018-11-091-0/+3
|\ | | | | | | Merge-request: !2570
| * FindBoost: Add system thread library to Boost_LIBRARIESFelix Geyer2018-11-091-0/+3
|/ | | | | | | | | Add the system thread library to Boost_LIBRARIES when the boost thread component has been found. The Boost::thread imported target already pulls in Threads::Threads. This changes does the same for projects using the Boost_LIBRARIES variable instead.
* CMake 3.13.0-rc3v3.13.0-rc3Brad King2018-11-071-1/+1
|
* Merge branch 'FindOpenMP-log-errors' into release-3.13Brad King2018-11-071-3/+10
|\ | | | | | | Merge-request: !2574
| * FindOpenMP: Log error outputIvan Pozdeev2018-11-071-1/+8
| |
| * FindOpenMP: Fix warnings with -Wstrict-prototypesIvan Pozdeev2018-11-071-2/+2
| | | | | | | | With -Wstrict-prototype -Werror, the check would fail
* | Merge branch 'cpack-doc-gen-names' into release-3.13Brad King2018-11-0616-59/+59
|\ \ | | | | | | | | | Merge-request: !2563
| * | Help: Use correct CPack generator namesCraig Scott2018-11-0616-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack generator names were not used consistently throughout the documentation, resulting in ambiguity about what the correct name was for use with the `cpack -G` option. With the changes in this commit, the cpack-generators(7) page of the manual now shows the correct names and other help pages no longer use inconsistent or incorrect names.
* | | Merge branch 'backport-FindBoost-explicit-arch-tag' into release-3.13Brad King2018-11-062-19/+33
|\ \ \ | | | | | | | | | | | | Merge-request: !2568
| * | | FindBoost: Add explicit Boost_ARCHITECTURE optionBrad King2018-11-052-19/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Boost 1.66 and above built with `--layout=versioned` add an architecture tag to the library file names. We already try to compute this tag automatically when `CMAKE_CXX_COMPILER_ARCHITECTURE_ID` is available, but that is currently not computed everywhere. Add an explicit `Boost_ARCHITECTURE` option that a user can set to specify the architecture tag. Issue: #17701
* | | | Merge branch 'rename-cpack-ext-generator' into release-3.13Brad King2018-11-0623-97/+99
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !2566
| * | | CPack: Rename Ext generator to ExternalCraig Scott2018-11-0523-97/+99
| | |/ | |/| | | | | | | | | | Ext and External were used inconsistently in the code and the docs. This change converts all uses of Ext to External, including within variable names used by the generator.
* | | Merge branch 'blaslapack95' into release-3.13Brad King2018-11-052-3/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !2560
| * | | FindLAPACK: Correct library name and symbol searched in LAPACK95 wrapperJakub Benda2018-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The symbol "CHEEV", originally used to determine if a library provides Fortran 95 wrappers for LAPACK, has been replaced by "cheev_f95". "CHEEV" is provided by libmkl_intel_(i)lp64, which does not provide the generic Fortran 95 wrappers. Instead, libmkl_lapack95_(i)lp64 does; one of the specializations of the type-generic interfaces contained in that library is "lapack_f95". Also, FindLAPACK used libmkl_intel_(i)lp64 instead of the correct libmkl_lapack95_(i)lp64 library for LAPACK95 functionality. This has been fixed, too.
| * | | FindBLAS: Correct symbol searched in BLAS95 wrapperJakub Benda2018-11-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The symbol "SGEMM", originally used to determine if a library provides Fortran 95 wrappers for BLAS, has been replaced by "sgemm_f95". "SGEMM" is provided by libmkl_intel_(i)lp64, which does not provide the generic Fortran 95 wrappers. Instead, libmkl_blas95_(i)lp does; one of the specializations of the type-generic interfaces contained in that library is "sgemm_f95".
* | | Merge branch 'custom-command-work-dir-genex' into release-3.13Brad King2018-11-054-15/+8
|\ \ \ | | | | | | | | | | | | Merge-request: !2559
| * | | add_custom_{command,target}: Fix WORKING_DIRECTORY leading genexBrad King2018-11-034-15/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.13.0-rc1~39^2 (add_custom_{command,target}: WORKING_DIRECTORY generator expressions, 2018-09-22) the `WORKING_DIRECTORY` option accepts generator expressions. Fix support for the case of a leading generator expression by deferring conversion to an absolute path until after evaluation of the generator expression. Fixes: #18543
* | | Merge branch 'update-curl' into release-3.13Brad King2018-11-05127-2180/+5100
|\ \ \ | | | | | | | | | | | | Merge-request: !2550
| * | | curl: backport upstream fix to 7.62.0 regressionBrad King2018-11-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Backport upstream curl commit 2c5ec339ea (Curl_follow: accept non-supported schemes for "fake" redirects, 2018-11-01) to get a fix to curl issue 3210, a regression in 7.62.0.
| * | | curl: Modernize tiny test code used for build inside CMakeBrad King2018-11-013-134/+57
| | | | | | | | | | | | | | | | | | | | Drop unused code. Report the error message on failure. Format the source file using clang-format.
| * | | curl: Update build within CMake to account for 7.62 changesBrad King2018-10-311-0/+2
| | | |
| * | | Merge branch 'upstream-curl' into update-curlBrad King2018-10-31124-2046/+5040
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2018-10-30 (19667715)
| | * | | curl 2018-10-30 (19667715)Curl Upstream2018-10-31124-2052/+5051
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 196677150f711a96c38ed123e621f1d4e995b2e5 (curl-7_62_0).
| * | | | curl: Update script to get curl 7.62.0Brad King2018-10-311-1/+1
| | |/ / | |/| |
* | | | Merge branch 'cpack-gen-docs-link' into release-3.13Craig Scott2018-11-051-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2562
| * | | | Help: Fix generators link in cpack(1) manualCraig Scott2018-11-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor rewording around the updated link and extra blank line added to improve readability and remove a potential ambiguity around the same area. Fixes: #18545
* | | | | Merge branch 'server-file-monitor-check' into release-3.13Brad King2018-11-011-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2556
| * | | | | server: Fix assertion failure on directory paths in file monitorVladimir Penev2018-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18532
* | | | | | Merge branch 'FindProtobuf-threads' into release-3.13Brad King2018-10-311-14/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2551
| * | | | | | FindProtobuf: Add missing link dependencies on threadsBrad King2018-10-311-14/+22
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protobuf headers have dependencies on threads. On UNIX platforms this requires linking to a threads library. We've long done this in the `Protobuf_LIBRARIES` result variable. However, the imported targets added by commit v3.9.0-rc1~81^2~2 (FindProtobuf: add targets, 2017-05-17) and commit v3.9.0-rc1~68^2 (FindProtobuf: Rename imported targets to match upstream names, 2017-05-22) were missing a dependency on threads. Add the dependency to the imported targets, and to the variables `Protobuf_LITE_LIBRARIES` and `Protobuf_PROTOC_LIBRARIES`. While this did not seem to matter in practice for a long time, protobuf 3.6 throws exceptions in some cases when threads are missing. Fixes: #18533
* | | | | | Merge branch 'fix-custom-target-with-csharp' into release-3.13Brad King2018-10-319-31/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2549
| * | | | | | CSharp: Fix regression in VS project type selection for custom targetBrad King2018-10-319-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A target created by `add_custom_target` should always be a `.vcxproj` file even if it has `.cs` sources involved in custom commands and such. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) does not check the target type and so is not a suitable check for deciding the project file extension. The `HasLanguage` method was an attempt at an abstraction that turns out not to work very well. Replace it with a dedicated `IsCSharpOnly` method that considers the target type, sources, and non-transitive `LINKER_LANGUAGE`. Fixes: #18515
* | | | | | | Merge branch 'FindPostgreSQL-11' into release-3.13Brad King2018-10-311-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2547
| * | | | | | | FindPostgreSQL: Search for version 11Sylvain Joubert2018-10-301-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'UseSWIG-typos' into release-3.13Brad King2018-10-291-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | Merge-request: !2542
| * | | | | | | UseSWIG: Add target language and input file in command descriptionSylvain Joubert2018-10-291-1/+1
| | | | | | | |
| * | | | | | | UseSWIG: Typo, add missing letterSylvain Joubert2018-10-291-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'FindBoost-stacktrace' into release-3.13Brad King2018-10-291-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2541
| * | | | | | | FindBoost: Add support for stacktrace componentsMartin Quinson2018-10-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the headers associated to `boost_stacktrace_*`. Fixes: #17297
* | | | | | | | Merge branch 'flang-preprocess-source' into release-3.13Brad King2018-10-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2545
| * | | | | | | | Flang: Fix command-line used to preprocess sourcesBrad King2018-10-291-1/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running flang with `-E` now ignores any `-o` option and always prints preprocessed output to stdout. Use shell redirection to place it in a file instead. Fixes: #18497
* | | | | | | | Merge branch 'qccDepfile' into release-3.13Brad King2018-10-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2540
| * | | | | | | | QNX: Update qcc depfile flags to be compliant with ccacheMaikel van den Hurk2018-10-291-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the flags to the preprocessor phase via `-Wp,`. This is accepted both by qcc and ccache.
* | | | | | | | Merge branch 'cuda-filter-device-link-libs' into release-3.13Brad King2018-10-291-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2536
| * | | | | | | | CUDA: Filter out non-static libraries during device linkingRobert Maynard2018-10-291-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device linking, 2018-03-27) we consider every link library during device linking and use `-Xnvlink` to pass those that do not end in `.a`. However, nvlink breaks on versioned shared library names such as `.so.1`. Work around this problem by not passing library paths that do not end in `.a` or `.lib`. nvlink would not find device symbols in them anyway. Fixes: #18504
* | | | | | | | | Merge branch 'UseSWIG-multi-input' into release-3.13Brad King2018-10-292-2/+40
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2539
| * | | | | | | | | UseSWIG: multiple input files must be supported in version 2Marc Chevrier2018-10-292-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18506
* | | | | | | | | | Merge branch 'set_directory_properties-script-mode' into release-3.13Brad King2018-10-297-2/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | Merge-request: !2544
| * | | | | | | | | set_directory_properties: Restore in script modeBrad King2018-10-297-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.10.0-rc1~391^2~3 (Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable, 2017-06-23) this command was accidentally not allowed in script mode. It was dropped because `ctest -S` mode needs to start with CMake's normal script mode and then replace the `set_directory_properties` implementation. Restore the normal `set_directory_properties` in script mode and then add special logic to replace it in ctest. Also add a test case. Fixes: #18523
* | | | | | | | | | Merge branch 'doc-updates' into release-3.13Brad King2018-10-264-7/+19
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | Merge-request: !2530
generated by cgit v0.12 at 2025-01-30 04:55:14 (GMT)