summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'extra-fphsa-space'Brad King2017-05-161-2/+2
|\ | | | | | | | | | | | | 3c515e19 FPHSA: remove extra space Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !843
| * FPHSA: remove extra spaceBen Boeckel2017-05-151-2/+2
| | | | | | | | | | | | Each missing variable is added to the string as " ${var}" which causes the string to always have a leading space. Remove the duplicate space due to this in the output.
* | Merge topic 'GNU-FindBinUtils-patterns'Brad King2017-05-161-2/+10
|\ \ | | | | | | | | | | | | | | | | | | 75accaae GCC: more patterns for ar/ranlib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !838
| * | GCC: more patterns for ar/ranlibRuslan Baratov2017-05-141-2/+10
| | |
* | | Merge topic 'mingw-w64-compile'Brad King2017-05-162-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9557b403 cmFileCommand: Fix build on mingw-w64 845f5e3c bootstrap: fix build on mingw-w64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !837
| * | | cmFileCommand: Fix build on mingw-w64Aleksey Chernov2017-05-151-0/+4
| | | | | | | | | | | | | | | | Include header needed for `CP_ACP`.
| * | | bootstrap: fix build on mingw-w64Aleksey Chernov2017-05-151-0/+1
| | | | | | | | | | | | | | | | Define the default code page for EncodingCXX too.
* | | | Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'Brad King2017-05-161-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !844
| * | | | VS: Fix debugging of C++ executables if CSharp is enabledMichael Stürmer2017-05-151-11/+11
| |/ / / | | | | | | | | | | | | Fixes: #16867
* | | | Merge topic 'FindOpenSSL-crypto-only'Brad King2017-05-161-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b410453 FindOpenSSL: Restore support for crypto-only result Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !846
| * | | | FindOpenSSL: Restore support for crypto-only resultBrad King2017-05-151-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and SSL libraries are present, 2017-01-03) we require both crypto and ssl libraries to be present. This makes sense because `OPENSSL_LIBRARIES` lists both and breaks when one is not found. However, prior to that fix we supported finding only the crypto library and using it through the imported target. Drop the requirement for ssl to restore support for using crypto alone. Later this module should be taught to support the `COMPONENTS` argument of `find_package`. Fixes: #16882
* | | | Merge topic 'FindDevIL-compat'Brad King2017-05-161-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8f0385f FindDevIL: Restore IL_FOUND result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !845
| * | | | FindDevIL: Restore IL_FOUND result variableBrad King2017-05-151-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when library is not found, 2016-11-24) removed the previously-provided `IL_FOUND` result variable. Set it for compatibility and update the documentation to mention the new variable. Fixes: #16881
* | | | CMake Nightly Date StampKitware Robot2017-05-161-1/+1
| | | |
* | | | Merge topic 'fix-target-alias-doc-typo'Brad King2017-05-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a6cbd47 Help: Fix typo in add_library(... ALIAS ...) text Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !840
| * | | | Help: Fix typo in add_library(... ALIAS ...) textGregor Jasny2017-05-141-1/+1
| | |/ / | |/| |
* | | | Merge topic 'autogen_settings'Brad King2017-05-151-14/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !836
| * | | | Autogen: Add -DWIN32 to definitions list on demandSebastian Holtermann2017-05-131-6/+8
| | | | |
| * | | | Autogen: Include moc/uic/rcc binary in settings hashSebastian Holtermann2017-05-131-8/+15
| | | | |
* | | | | Merge topic 'cpack-components-handle-symlinks'Brad King2017-05-159-4/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26384068 CPack test symlinks in package 6949b71f CPack unify component/monolithic package symlink handling 3eb0f080 Improved CPack tests error logging Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !841
| * | | | | CPack test symlinks in packageDomen Vrankar2017-05-145-0/+59
| | | | | |
| * | | | | CPack unify component/monolithic package symlink handlingDomen Vrankar2017-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non component package generation was recursing through symlinks while monolithic package generation did not. This was causing component archive packages to contain both symlink and a directory with the same name on the same level if symlink contained files which caused errors during extraction of such packages. Closes #16051
| * | | | | Improved CPack tests error loggingDomen Vrankar2017-05-143-4/+6
| | |/ / / | |/| | |
* | | | | Merge topic 'FindPkgConfig-fix-lib-search'Brad King2017-05-151-1/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !835
| * | | | FindPkgConfig: Fix pkg_check_modules() non-standard location searchYuriy Khokhulya2017-05-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During search of the library file `pkg_check_modules()` attempts to find it in last specified library path in `${_prefix}_LDFLAGS`, that after dependency resolving contains path to standard location. So in case when `${_prefix}_LDFLAGS` has: -L/prefix;-L/usr/local/lib;-llibrary_from_prefix;-ldependency `library_from_prefix` will not be found. As solution need try to find the library in all paths preceding to the library. Fixes: #16873
* | | | | CMake Nightly Date StampKitware Robot2017-05-151-1/+1
| |/ / / |/| | |
* | | | CMake Nightly Date StampKitware Robot2017-05-141-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-05-131-1/+1
| |/ / |/| |
* | | Merge topic 'command-name'Brad King2017-05-12119-796/+268
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1218f59 cmCommand: remove unused methods from interface and all implementations 4ba25a82 cmState: separate builtin and scripted commands a44dab46 cmState: introduce method for adding scripted commands c734c850 CTest: use new methods for builtin commands bd14e464 cmCommands: use new methods for builtin commands 58708405 cmState: introduce methods for adding builtin commands a890ca2f cmakemain: use script role for -P Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !829
| * | | cmCommand: remove unused methods from interface and all implementationsDaniel Pfeifer2017-05-11113-571/+7
| | | |
| * | | cmState: separate builtin and scripted commandsDaniel Pfeifer2017-05-112-70/+52
| | | |
| * | | cmState: introduce method for adding scripted commandsDaniel Pfeifer2017-05-115-10/+10
| | | |
| * | | CTest: use new methods for builtin commandsDaniel Pfeifer2017-05-113-27/+26
| | | |
| * | | cmCommands: use new methods for builtin commandsDaniel Pfeifer2017-05-111-132/+156
| | | |
| * | | cmState: introduce methods for adding builtin commandsDaniel Pfeifer2017-05-113-0/+29
| | | |
| * | | cmakemain: use script role for -PDaniel Pfeifer2017-05-111-1/+3
| |/ /
* | | Merge topic 'getprerequisites-fix'Brad King2017-05-121-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e0e414d6 GetPrerequisites: Only recurse on resolved unseen prerequisites Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !804
| * | | GetPrerequisites: Only recurse on resolved unseen prerequisitesGuillaume Dumont2017-05-111-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | I encountered an issue where not all prerequisites would be listed by `get_prerequisites` since some of the prerequisites cannot be resolved and are added to the list of unseen prerequisites. This has the side effect of clearing the list of `prerequisites_var` and thus removes some prerequisites from the list. Fix it.
* | | Merge topic 'add_cuda_cxx14_flag'Brad King2017-05-122-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 036ffe81 CUDA: Add support for the C++14 standard flag. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !830
| * | | CUDA: Add support for the C++14 standard flag.Robert Maynard2017-05-112-0/+7
| | | | | | | | | | | | | | | | | | | | CUDA 9 toolkit has announced support for C++14 flag, so lets allow users to use it.
* | | | Merge topic 'sunpro-c-features'Brad King2017-05-124-1/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d13fe28 Features: Record features for SunPro C 5.13 and 5.14 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !832
| * | | | Features: Record features for SunPro C 5.13 and 5.14Brad King2017-05-114-1/+41
| | |/ / | |/| |
* | | | Merge topic 'update-curl'Brad King2017-05-12114-2211/+3604
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95d3ebcc curl: Set TLS/SSL build options the way we need for CMake 11ba72c6 curl: Skip building docs within CMake 29997590 Merge branch 'upstream-curl' into update-curl fd7d521c curl 2017-04-19 (d957e218) 5af9c8e2 curl: Update script to get curl 7.54.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !828
| * | | | curl: Set TLS/SSL build options the way we need for CMakeBrad King2017-05-111-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore settings to match what we had before resolving conflicts in the latest update. Use native APIs on Windows and Apple. Pass CA bundle/path options.
| * | | | curl: Skip building docs within CMakeBrad King2017-05-111-0/+5
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2017-05-11113-2211/+3567
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2017-04-19 (d957e218) Resolve conflicts in `CMakeLists.txt` in favor of the upstream version. We will re-apply our logic as needed in following commits.
| | * | | | curl 2017-04-19 (d957e218)Curl Upstream2017-05-11115-2193/+3568
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit d957e2189fdc73cef0ff3d1fb58043d354754449 (curl-7_54_0).
| * | | | | curl: Update script to get curl 7.54.0Brad King2017-05-111-1/+2
| | |/ / / | |/| | |
* | | | | Merge topic 'lexerparser-fix-bootstrap'Brad King2017-05-121-13/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1e8f27f bootstrap: fix Bad substitution Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !831
| * | | | | bootstrap: fix Bad substitutionDaniel Pfeifer2017-05-111-13/+24
| |/ / / /
generated by cgit v0.12 at 2025-01-28 02:28:53 (GMT)