summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.10'Brad King2017-10-180-0/+0
|\
| * Merge branch 'vs-cuda-machine' into release-3.10Brad King2017-10-171-0/+7
| |\ | | | | | | | | | Merge-request: !1390
| * \ Merge branch 'findopenmp-lib-paths' into release-3.10Brad King2017-10-171-7/+21
| |\ \ | | | | | | | | | | | | Merge-request: !1385
* | \ \ Merge topic 'cmake-open'Brad King2017-10-1821-29/+299
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96d642c7 cmake-gui: Use cmake::Open to open generated project 5de37a4a cmake: Add --open option for IDE generators Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !1337
| * | | | cmake-gui: Use cmake::Open to open generated projectGregor Jasny2017-10-134-28/+46
| | | | |
| * | | | cmake: Add --open option for IDE generatorsGregor Jasny2017-10-1317-1/+253
| | | | |
* | | | | Merge topic 'module-fetchcontent'Brad King2017-10-1823-0/+1266
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e56634f FetchContent: Add tests 60e74d2f FetchContent: New module for populating content at configure time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1306
| * | | | | FetchContent: Add testsCraig Scott2017-10-1618-0/+318
| | | | | |
| * | | | | FetchContent: New module for populating content at configure timeCraig Scott2017-10-165-0/+948
| | | | | |
* | | | | | Merge topic 'vs-cuda-machine'Brad King2017-10-181-0/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | fd90a14f VS: Set CUDA TargetMachinePlatform explicitly on x64 Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'findopenmp-lib-paths'Brad King2017-10-181-7/+21
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f4cc7109 FindOpenMP: Improve OMP libraries search Acked-by: Kitware Robot <kwrobot@kitware.com> 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
* | | | | | CMake Nightly Date StampKitware Robot2017-10-181-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.10'Brad King2017-10-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'vs-2017-cl-check' into release-3.10Brad King2017-10-162-25/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1388
| * \ \ \ \ \ Merge branch 'imported-interface-no-system' into release-3.10Brad King2017-10-135-15/+22
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1386
* | \ \ \ \ \ \ Merge topic 'vs-2017-cl-check'Brad King2017-10-172-25/+40
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f566586e VS: Detect compiler component in VS 2017 instances more reliably c6bb704e cmVSSetupHelper: Fix install location encoding conversion 4c3116d7 cmVSSetupHelper: Factor out install location string construction Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'Linux-CUDA-OpenCL'Brad King2017-10-171-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 060fd233 FindOpenCL: Add support for CUDA OpenCL on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1387
| * | | | | | | FindOpenCL: Add support for CUDA OpenCL on LinuxTakenori Yamamoto2017-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting CUDA_PATH, the include directory ($CUDA_PATH/include) was found, but libOpenCL.so was not found. This patch resloved the issue.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-10-171-1/+1
| | | | | | | |
* | | | | | | | 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
generated by cgit v0.12 at 2025-01-24 04:19:43 (GMT)