summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release'Brad King2017-05-160-0/+0
|\
| * Merge branch 'mingw-w64-compile' into releaseBrad King2017-05-152-0/+5
| |\
| * \ Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into releaseBrad King2017-05-151-11/+11
| |\ \
| * \ \ Merge branch 'FindOpenSSL-crypto-only' into releaseBrad King2017-05-151-2/+2
| |\ \ \
| * \ \ \ Merge branch 'FindDevIL-compat' into releaseBrad King2017-05-151-1/+3
| |\ \ \ \
* | \ \ \ \ Merge topic 'xcode-try_compile-scheme'Brad King2017-05-161-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c608000a Xcode: Work around xcodebuild spurious hangs in try_compile b8e707a6 Xcode: Refactor internal decision for scheme generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !850
| * | | | | | Xcode: Work around xcodebuild spurious hangs in try_compileBrad King2017-05-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `xcodebuild` occasionally hangs on some macOS machines (and can be reproduced independent of CMake). It only happens a few times in 1000 runs, but configuration of a large project calls `try_compile` many times and therefore frequently hangs due to this problem. I've been unable to reproduce the hang when using a scheme to build, so always generate a scheme in `try_compile` projects to work around the problem. Issue: #16752
| * | | | | | Xcode: Refactor internal decision for scheme generationBrad King2017-05-151-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the Xcode version check out to wrap everything.
* | | | | | | Merge topic 'early-config-name'Brad King2017-05-164-13/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !848
| * | | | | | | cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on constructionBrad King2017-05-154-13/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the value to our `ConfigName` member on construction to ensure it is available even to code paths that run before `Generate`. We once needed to delay this lookup until `Generate` because the local generators were at one time created before `Configure`. Now they are created at generate time which is late enough to expect `CMAKE_BUILD_TYPE` to be available. Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules` causes use of `ConfigName` before it is populated which breaks use of source files that depend on the `$<CONFIG>` generator expression. Fixes: #16889
* | | | | | | Merge topic 'cpackifw-i18n'Brad King2017-05-166-25/+145
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72ac7ad9 CPackIFW: Internationalization Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !748
| * | | | | | | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-126-25/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS; - Added internationalization support for DisplayName and Description properties in cmCPackIFWPackage class; - Added documentation to CPackIFW module; - Added release note.
* | | | | | | | 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.
generated by cgit v0.12 at 2024-11-14 22:37:09 (GMT)