summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.10.0-rc3v3.10.0-rc3Brad King2017-10-191-1/+1
|
* Merge branch 'vs-cuda-machine' into release-3.10Brad King2017-10-171-0/+7
|\ | | | | | | Merge-request: !1390
| * VS: Set CUDA TargetMachinePlatform explicitly on x64Brad King2017-10-171-0/+7
| | | | | | | | | | | | | | | | | | | | The `TargetMachinePlatform` setting tells CUDA what `--machine {32,64}` flag to pass to nvcc. While CUDA automatically chooses the proper default for the target architecture, it does not reflect this in the user-visible IDE settings. Set it explicitly to fix the user-visible setting. Fixes: #17355
* | Merge branch 'findopenmp-lib-paths' into release-3.10Brad King2017-10-171-7/+21
|\ \ | | | | | | | | | Merge-request: !1385
| * | FindOpenMP: Improve OMP libraries searchChristian Pfeiffer2017-10-171-7/+21
| | | | | | | | | | | | | | | | | | | | | This supports libraries given as full path and filters libraries given in CMAKE_<LANG>_STANDARD_LIBRARIES. Fixes: #17351
* | | Merge branch 'vs-2017-cl-check' into release-3.10Brad King2017-10-162-25/+40
|\ \ \ | | | | | | | | | | | | Merge-request: !1388
| * | | VS: Detect compiler component in VS 2017 instances more reliablyBrad King2017-10-162-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Microsoft.VisualStudio.Component.VC.Tools.x86.x64` component is not the only way a VS instance may provide the `cl` compiler tool. For example, VS 2017 Express Edition does not install that component. Instead search for the tools directly on disk within an instance. Suggested-by: Rich Chiodo <rchiodo@microsoft.com> Fixes: #17349
| * | | cmVSSetupHelper: Fix install location encoding conversionBrad King2017-10-161-2/+3
| | | |
| * | | cmVSSetupHelper: Factor out install location string constructionBrad King2017-10-162-6/+12
| | |/ | |/| | | | | | | This also adds a missing conversion to unix slashes in one code path.
* | | Merge branch 'imported-interface-no-system' into release-3.10Brad King2017-10-135-15/+22
|\ \ \ | | | | | | | | | | | | Merge-request: !1386
| * | | Help: Clarify documentation of NO_SYSTEM_FROM_IMPORTEDBrad King2017-10-132-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This property is meant to be set on the consumers of imported targets, not the imported targets themselves. Fixes: #17348
| * | | Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE librariesBrad King2017-10-134-7/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~276^2 (Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries, 2016-11-21) was incorrect. The property is not meant to be set on imported targets at all. It is meant to be set on their consumers that compile sources. Since INTERFACE libraries have no sources to compile, the property is not needed on them. Revert most of that change. Unfortunately we must still tolerate project code setting NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries because they were allowed by CMake 3.8 and 3.9. Issue: #17348
* | | CMake 3.10.0-rc2v3.10.0-rc2Brad King2017-10-121-1/+1
| | |
* | | Merge branch 'FindXMLRPC-no-includes' into release-3.10Brad King2017-10-111-29/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !1377
| * | | FindXMLRPC: Tolerate no include directoriesBrad King2017-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `xmlrpc-c-config $modules --cflags` may report no `-I` flags if the headers are in a standard location like `/usr/include`. In this case it is okay for `XMLRPC_INCLUDE_DIRS` to be empty. Ideally the `--cflags` output should be used as hints for a `find_path` call to really find the headers as we do for other find modules, but simply assuming no explicit include directories are needed is good enough for now. Fixes: #17347
| * | | FindXMLRPC: Drop unnecessary exec_program code pathsBrad King2017-10-111-28/+12
| |/ / | | | | | | | | | | | | We always have `execute_process` now, so drop our ancient `exec_program` code paths that are never used anymore.
* | | Merge branch 'clang-msvc-help' into release-3.10Brad King2017-10-113-0/+37
|\ \ \ | | | | | | | | | | | | Merge-request: !1373
| * | | Clang: Diagnose unsupported GNU-like clang targeting MSVC ABIBrad King2017-10-103-0/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The LLVM/Clang installer on Windows provides a `LLVM/bin` directory containing `clang.exe` and `clang++.exe` command-line tools that have a GNU-like command-line but target the MSVC ABI (instead of MinGW). We do not support this combination, so diagnose and reject it explicitly. Tell users what to do to use the `clang-cl.exe` tool instead. Issue: #16439
* | | Merge branch 'cpack-deb-mr-1296-fix' into release-3.10Brad King2017-10-115-6/+54
|\ \ \ | | | | | | | | | | | | Merge-request: !1375
| * | | CPack/Deb: fix for regex passing even if invalid characters are presentDomen Vrankar2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Regex [+-~] passes all characters between + and ~ and not only +, - and ~
| * | | CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exceptionDomen Vrankar2017-10-105-6/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also contain release and epoch version so regex test should expect the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE and CPACK_DEBIAN_PACKAGE_EPOCH are not set. Also since the checks were not performed in the past the regex test of CPACK_DEBIAN_PACKAGE_VERSION variable content should only report author warnings instead of errors in case of the test fail. Fixes: #17339
* | | | Merge branch 'ExternalProject-CMP0054' into release-3.10Brad King2017-10-111-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1369
| * | | | ExternalProject: Avoid if() auto-dereferene in quoted argumentsBrad King2017-10-111-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of this module doesn't expect such dereferences to happen, but can when a project sets a variable called `x`. Set `CMP0054` explicitly to get its NEW behavior. Fixes: #17335
* | | | Merge branch 'update-curl' into release-3.10Brad King2017-10-11144-5795/+7998
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1372
| * | | | curl: Update build within CMake to account for 7.56 changesBrad King2017-10-102-1/+5
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2017-10-10143-5793/+7984
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
| | * | | | curl 2017-10-04 (3ea76790)Curl Upstream2017-10-10143-5808/+7983
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 3ea76790571c1f7cf1bed34fabffd3cc20ad3dd3 (curl-7_56_0).
| * | | | | curl: Update script to get curl 7.56.0Brad King2017-10-101-2/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'autogen-skip-ui' into release-3.10Brad King2017-10-108-15/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1366
| * | | | | Autogen: Docs: Extend SKIP_AUTOUIC documentationSebastian Holtermann2017-10-101-0/+5
| | | | | |
| * | | | | Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONSSebastian Holtermann2017-10-096-9/+63
| | | | | |
| * | | | | Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sourcesSebastian Holtermann2017-10-091-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SKIP_AUTOUIC and SKIP_AUTOGEN were ignored when set on a `.ui` file that was not in the sources of the target.
* | | | | | Merge branch 'doc-lang-clarify' into release-3.10Brad King2017-10-101-8/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1358
| * | | | | | Help: Minor text clarifications in cmake-language(7) manualBrad King2017-10-101-8/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify definitions of `bracket_open` and `bracket_close` productions. In note about unquoted arguments containing unescaped double quotes, provide examples of how they can be written as quoted arguments. Also clarify location of nested calls supported by variable function scope. Suggested-by: Дилян Палаузов <dilyan.palauzov@aegee.org>
* | | | | | Merge branch 'xcode-tests-ios-deployment-target' into release-3.10Brad King2017-10-105-27/+20
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | Merge-request: !1365
| * | | | | Xcode 9: Lower iOS deployment version to get armv7 buildsGregor Jasny2017-10-101-5/+16
| | | | | |
| * | | | | Revert "Xcode: Adjust tests to drop of 32bit iOS architectures"Gregor Jasny2017-10-105-22/+4
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d210b2813072c874ee13fcc941e41aacacf09874.
* | | | | | Merge branch 'target_properties_doc_cleanup' into release-3.10Brad King2017-10-102-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1361
| * | | | | | Help: Fix Example appearing in target property list of contentsCraig Scott2017-10-072-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'doc_bundle_wrong_plist_property' into release-3.10Brad King2017-10-101-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1362
| * | | | | | Help: Fix wrong property reference for an app bundle's Info.plistCraig Scott2017-10-071-1/+1
| |/ / / / /
* | | | | | Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10Brad King2017-10-101-1/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1360
| * | | | | | FindCUDA: Update for CUDA 9 breakup of nppi into multiple librariesRobert Maynard2017-10-061-1/+39
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Fixes: #17310
* | | | | | Merge branch 'FindProtobuf-doc-typo' into release-3.10Brad King2017-10-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1359
| * | | | | | FindProtobuf: fix documentation typoAndré Apitzsch2017-10-061-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in documentation added by commit v3.10.0-rc1~18^2 (FindProtobuf: add flag to allow descriptor files to be generated, 2017-09-21).
* | | | | | Merge branch 'ipo-escape-toolchain-path' into release-3.10Brad King2017-10-062-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1356
| * | | | | | IPO: Fix support for spaces in path to archive toolsThomas Stenersen2017-10-062-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the normal archiving rules the ``<CMAKE_AR>`` placeholder is replaced by the generators with a properly-quoted path to the tool. In the IPO rules we specify the tools directly, so we need to quote them. Fixes: #17326
* | | | | | Merge branch 'FindJava-tolerant-versions' into release-3.10Brad King2017-10-061-25/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1355
| * | | | | | FindJava: Revise version parsing to support Java 9Brad King2017-10-061-25/+42
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java 9 has only one component. Revise the logic to tolerate any number of version components 1 through 4. Fix the parsing of individual components. Fixes: #17325
* | | | | | Merge branch 'revise-3.10-relnotes' into release-3.10Brad King2017-10-061-19/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | Merge-request: !1357
generated by cgit v0.12 at 2024-09-02 18:32:23 (GMT)