summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CUDA: Fix crash on linking to a CUDA target without CUDA enabledBrad King2018-12-056-1/+20
| | | | | | | | Do not try to device link or add CUDA runtime libraries if the language is not enabled. Fixes: #18673 Issue: #18614
* CMake 3.13.1v3.13.1Brad King2018-11-281-1/+1
|
* Merge branch 'autogen_uic_empty_fix_3_13' into release-3.13Brad King2018-11-271-1/+1
|\ | | | | | | Merge-request: !2667
| * Autogen: Fix empty uic executable stringSebastian Holtermann2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | In CMake 3.13.0 when a target has ``AUTOUIC`` enabled but doesn't link against Qt5Widgets, the uic executable string is empty and an error string "The uic executable \"\" does not exist" is generated. In CMake 3.12 ``AUTOUIC`` was silently disabled instead. This patch fixes the regression and restores the behavior of CMake 3.12. Fixes: #18630
* | Merge branch 'vs2015-no-sdk' into release-3.13Brad King2018-11-261-17/+21
|\ \ | | | | | | | | | Merge-request: !2656
| * | VS: Avoid crash with VS 2015 when all SDKs are higher than 10.0.14393.0Harry Mallon2018-11-261-17/+21
| |/ | | | | | | | | | | | | | | | | | | | | | | Move the filter added by commit v3.13.0-rc1~72^2~2 (VS: Do not select a Windows SDK too high for current VS version, 2017-08-07, committed 2018-09-17) to before our check that the remaining list is empty. Otherwise we crash when dereferencing the first entry of an empty vector. Also add a comment explaining where 10.0.14393.0 came from. Fixes: #18633
* | Merge branch 'FindBoost-no-cxx' into release-3.13Brad King2018-11-264-6/+6
|\ \ | | | | | | | | | Merge-request: !2663
| * | FindBoost: Restore finding without CXX language enabledBrad King2018-11-264-6/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit v3.13.0~7^2 (FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+, 2018-11-07) we run the internal `_Boost_COMPILER_DUMPVERSION` macro on all UNIX platforms. Teach the macro to tolerate missing `CMAKE_CXX_COMPILER_VERSION`, which occurs when the CXX language is not enabled. Fixes: #18624
* | Merge branch 'fortran-submodule-case' into release-3.13Brad King2018-11-203-117/+117
|\ \ | |/ |/| | | Merge-request: !2644
| * Fortran: Fix module dependency scanning with upper-case SUBMODULEBrad King2018-11-203-117/+117
|/ | | | | | | | The lexical token expression added by commit v3.7.0-rc1~73^2~1 (Fortran: Add support for submodule syntax in dependency scanning, 2016-09-05) has a typo and does not match upper-case `B` in `SUBMODULE`. Fix it. Fixes: #18595
* CMake 3.13.0v3.13.0Brad King2018-11-201-1/+1
|
* Merge branch 'blas-pkgcfg' into release-3.13Brad King2018-11-191-0/+1
|\ | | | | | | Merge-request: !2631
| * FindBLAS: Restore BLAS_FOUND when found using pkgconfigMartin von Gagern2018-11-191-0/+1
| | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~92^2 (FindPkgConfig: export the list of found libraries also as variable, 2018-05-11) dropped use of FPHSA to set `BLAS_FOUND`. Set it explicitly instead.
* | Merge branch 'FindPython-lib-arch' into release-3.13Brad King2018-11-191-0/+17
|\ \ | | | | | | | | | Merge-request: !2624
| * | FindPython: Ensure config tool matches library architectureMarc Chevrier2018-11-191-0/+17
| |/
* | Merge branch 'irsl-ucrt-version' into release-3.13Brad King2018-11-191-3/+19
|\ \ | | | | | | | | | Merge-request: !2637
| * | IRSL: Detect versioned Windows Universal CRT directoriesBrad King2018-11-191-3/+19
| |/ | | | | | | | | | | | | Windows SDK version 10.0.17763.0 now places the uCRT libraries in a versioned directory. Fixes: #18603
* | Merge branch 'backport-configure_file-canonical-deps' into release-3.13Brad King2018-11-195-11/+18
|\ \ | | | | | | | | | Merge-request: !2635
| * | configure_file: canonicalize input and output path in dependenciesFrank Benkstein2018-11-195-11/+18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent the input file path internally in canonical form. Otherwise multiple `configure_file` calls that share the same input file but specify it relative to different directories (e.g. via `../`) result in multiple copies of the dependency on the rule to re-run CMake. This causes the Ninja generator to emit duplicate phony build statements for these dependencies, which generates an error with `-w dupbuild=err`, which will be default in Ninja 1.9. Also canonicalize the output path for consistency. Add a test case. Fixes: #18584
* | Merge branch 'ctest-stdin' into release-3.13Brad King2018-11-157-2/+45
|\ \ | | | | | | | | | Merge-request: !2618
| * | CTest: Restore inheritance of stdin by test processesBrad King2018-11-156-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~117^2 (CTest: Re-implement test process handling using libuv, 2017-12-10) we do not give the child test processes any stdin. Prior to that change we let the child test processes inherit stdin from ctest itself. Tests that run serially might be able to use the real stdin meaningfully, so restore that behavior and add a test case. Fixes: #18591
| * | Tests: Teach RunCMake infrastructure to optionally provide stdinBrad King2018-11-151-0/+9
| |/
* | Merge branch 'FindBoost-1.69' into release-3.13Brad King2018-11-132-5/+5
|\ \ | | | | | | | | | Merge-request: !2601
| * | FindBoost: Additional fixes for 1.69Roger Leigh2018-11-132-5/+5
| |/
* | Merge branch 'FindBoost-compiler-guess-update' into release-3.13Brad King2018-11-091-7/+26
|\ \ | | | | | | | | | Merge-request: !2579
| * | FindBoost: Improve compiler prefix detection for GCC 5+ and clang 4+Mateusz Łoskot2018-11-091-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add recognition of compiler version and prefix for clang. Accommodate changes to version numbering scheme for GCC 5+ and clang 4+ - Minor number becomes patch, so excluded it from compiler prefix. - Improves searching for Boost 1.69+ libraries built with GCC 5+ and clang 4+, where library names are generated with compiler tag based on major version only eg. -gcc5 for GC 5.5.0 or -clang6 for clang 6.0.0 - Follows up related changes in upcoming Boost 1.69 https://github.com/boostorg/build/pull/349 Dump detected compiler version in Boost_DEBUG message. Replace use of CMAKE_COMPILER_IS_GNUCXX with CMAKE_CXX_COMPILER_ID.
* | | Merge branch 'asm-compiler-id-clang' into release-3.13Brad King2018-11-091-0/+8
|\ \ \ | |/ / |/| | | | | Merge-request: !2584
| * | ASM: Detect compiler id for Clang used as AssemblerBrad King2018-11-091-0/+8
| |/ | | | | | | | | | | | | | | | | | | Add missing vendor table entries for Clang and AppleClang to identify them. Previously this worked only if Clang was also enabled as a C or CXX compiler first because we used to copy the C compiler id. However, that was removed by commit v3.13.0-rc1~44^2 (ASM: Search for full path even when using C or C++ compiler, 2018-09-26). Fixes: #18575
* | 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)
generated by cgit v0.12 at 2025-02-09 12:12:00 (GMT)