summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'imported-interface-no-system'Brad King2017-10-165-15/+22
|\ | | | | | | | | | | | | | | 22beb07f Help: Clarify documentation of NO_SYSTEM_FROM_IMPORTED 2de0e0fd Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | Merge topic 'UseJava-add_jar-split-build-and-output-dirs'Brad King2017-10-161-4/+4
|\ \ | | | | | | | | | | | | | | | | | | 48dcb2f0 UseJava: add_jar OUTPUT_DIR option used only for jar generation. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1380
| * | UseJava: add_jar OUTPUT_DIR option used only for jar generation.Marc Chevrier2017-10-121-4/+4
| | | | | | | | | | | | | | | | | | Build artifacts go to CMAKE_CURRENT_BINARY_DIR subdirectory in all cases. Fixes: #17341
* | | Merge topic 'cpack-wix-cygwin'Brad King2017-10-169-17/+193
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1409101 cpack wix: support WiX generator on Cygwin e258fe03 cpack wix: fix path error on cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1367
| * | | cpack wix: support WiX generator on CygwinStephen Sorley2017-10-138-16/+192
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cygwin-built CMake now converts paths from Cygwin to Windows form (using cygpath -w) before they're passed to WiX. The Wix generator on Cygwin requires the libuuid-dev package when building CMake. However, the DLL it links to is installed by default as part of Cygwin's core libs, so it does not need to be distributed. If libuuid-dev isn't available, CMake is simply built without Wix support on Cygwin.
| * | | cpack wix: fix path error on cygwinStephen Sorley2017-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under Cygwin, file(TO_CMAKE_PATH...) outputs invalid paths when given a Windows path as input (the colon after the drive letter gets replaced by a semicolon). As a workaround, just use a string replace to change the slashes instead.
* | | | Merge topic 'cpack-dmg-errors'Brad King2017-10-161-6/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1943dc6b cmCPackDragNDropGenerator: Improve error reporting Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1379
| * | | | cmCPackDragNDropGenerator: Improve error reportingClinton Stimpson2017-10-121-6/+14
| | | | | | | | | | | | | | | | | | | | When running hdiutil and other commands, capture errors and log them.
* | | | | Merge topic 'update-kwsys'Brad King2017-10-165-27/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df92617b Merge branch 'upstream-KWSys' into update-kwsys e44b0cb2 KWSys 2017-10-12 (ef0ad34d) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1384
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-10-135-27/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-10-12 (ef0ad34d)
| | * | | | | KWSys 2017-10-12 (ef0ad34d)KWSys Upstream2017-10-135-27/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit ef0ad34d280f0553fc4f6e7202a5e7d6241cdc9c (master). Upstream Shortlog ----------------- Rolf Eike Beer (2): 8717ac15 DynamicLoader: use std::string instead of strcpy() + strcat() 88d4dd4b CommandLineArguments: use std::string in GenerateHelp() Wouter Klouwen (1): 749b7506 ProcessUNIX: Use monotonic clock in kwsysProcessTimeGetCurrent() for POSIX
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-161-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-151-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-141-1/+1
|/ / / / / /
* | | | | | CMake Nightly Date StampKitware Robot2017-10-131-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-10-120-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.10.0-rc2v3.10.0-rc2Brad King2017-10-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.10'Brad King2017-10-120-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'FindXMLRPC-no-includes' into release-3.10Brad King2017-10-111-29/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1377
| * \ \ \ \ \ \ Merge branch 'clang-msvc-help' into release-3.10Brad King2017-10-113-0/+37
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1373
* | \ \ \ \ \ \ \ Merge topic 'FindPythonLibs-names-per-dir'Brad King2017-10-121-4/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 192ab741 FindPythonLibs: Allow find_library to search paths from system environment 3976a106 FindPythonLibs: Prefer libs early in search path regardless of name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1378
| * | | | | | | | | FindPythonLibs: Allow find_library to search paths from system environmentBrad King2017-10-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library` calls. No other find modules do this. Also, since commit v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from PATH, 2015-02-18) we always search the `lib` directory of each prefix before the `bin` directory and so should prefer the non-`.dll` name. Issue: #17336
| * | | | | | | | | FindPythonLibs: Prefer libs early in search path regardless of nameBrad King2017-10-111-0/+3
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `NAMES_PER_DIR` to all `find_library` invocations so that we consider all possible names in each search directory before moving on to the next directory. This helps find the package that appears earliest in the search path regardless of how it names its libraries. Fixes: #17336
* | | | | | | | | Merge topic 'FindXMLRPC-no-includes'Brad King2017-10-121-29/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7720a0f FindXMLRPC: Tolerate no include directories b1aa8a47 FindXMLRPC: Drop unnecessary exec_program code paths Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'clang-msvc-help'Brad King2017-10-123-0/+37
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | b6d3a1c0 Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | CMake Nightly Date StampKitware Robot2017-10-121-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release-3.10'Brad King2017-10-110-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'cpack-deb-mr-1296-fix' into release-3.10Brad King2017-10-115-6/+54
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1375
| * \ \ \ \ Merge branch 'ExternalProject-CMP0054' into release-3.10Brad King2017-10-111-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1369
| * \ \ \ \ \ Merge branch 'update-curl' into release-3.10Brad King2017-10-11144-5795/+7998
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1372
| * \ \ \ \ \ \ Merge branch 'autogen-skip-ui' into release-3.10Brad King2017-10-108-15/+78
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1366
| * \ \ \ \ \ \ \ Merge branch 'doc-lang-clarify' into release-3.10Brad King2017-10-101-8/+10
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1358
| * \ \ \ \ \ \ \ \ Merge branch 'xcode-tests-ios-deployment-target' into release-3.10Brad King2017-10-105-27/+20
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1365
* | \ \ \ \ \ \ \ \ \ Merge topic 'cpack-deb-mr-1296-fix'Brad King2017-10-115-6/+54
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present 529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'linked-tree'Brad King2017-10-111-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff09abb8 cmLinkedTree: avoid unnecessary copies during Push of T Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1351
| * | | | | | | | | | cmLinkedTree: avoid unnecessary copies during Push of TMatthias Maennich2017-10-091-3/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge topic 'simplify-env-var-determination'Brad King2017-10-112-19/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5731f6d5 cm{Unset,Set}Command: use std::string to determine the env variable name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1350
| * | | | | | | | | | cm{Unset,Set}Command: use std::string to determine the env variable nameMatthias Maennich2017-10-102-19/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'ExternalProject-CMP0054'Brad King2017-10-111-0/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'UseJava_OUTPUT_DIR'Brad King2017-10-113-0/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dead049e UseJava: OUTPUT_DIR must exists in all cases. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1368
| * | | | | | | | | UseJava: OUTPUT_DIR must exists in all cases.Marc Chevrier2017-10-103-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17316
* | | | | | | | | | Merge topic 'autogen-skip-ui'Brad King2017-10-118-15/+78
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e95429fd Autogen: Docs: Extend SKIP_AUTOUIC documentation 814cddbe Autogen: Docs: Add examples for AUTORCC_OPTIONS and AUTOUIC_OPTIONS 1c196268 Autogen: Allow setting SKIP_AUTOUIC/GEN on .ui files not in the sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1366
generated by cgit v0.12 at 2025-01-31 22:48:50 (GMT)