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
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
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
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
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
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
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
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.
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.
* 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.
