summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vs15-GNUtoMS' into releaseBrad King2017-05-221-0/+15
|\
| * GNUtoMS: Add search path for VS 2017 environment scriptsAlex Ghosh2017-05-221-0/+15
| | | | | | | | | | | | Use `cmake_host_system_information` to query the VS Installer tool for the locations of VS versions since VS 2017 does not provide registry entries anymore. Add a loop to simplify addition of future versions.
* | Merge branch 'vs14-GNUtoMS' into releaseBrad King2017-05-171-0/+2
|\ \ | |/
| * GNUtoMS: Add search path for VS 2015 environment scriptsAlex Ghosh2017-05-171-0/+2
| |
* | Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into releaseBrad King2017-05-151-11/+11
|\ \
| * | VS: Fix debugging of C++ executables if CSharp is enabledMichael Stürmer2017-05-151-11/+11
| |/ | | | | | | Fixes: #16867
* | Merge branch 'FindOpenSSL-crypto-only' into releaseBrad King2017-05-151-2/+2
|\ \
| * | 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
* | 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
* Merge branch 'FindMatlab-2017a' into releaseBrad King2017-05-011-0/+1
|\
| * FindMatlab: Add support for Matlab 2017aRaffi Enficiaud2017-05-011-0/+1
| |
* | Merge branch 'FindBoost-backport-fixes' into releaseBrad King2017-04-241-14/+42
|\ \
| * | FindBoost: Support prebuilt Windows binaries from SourceForgeRoger Leigh2017-04-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This are searched for in the default installed location C:/local/boost_${ver} Cherry picked from commit 862482df274121e6f80dca925fb01d996710ed5e for backport to CMake 3.8.
| * | FindBoost: Allow testing for multiple compiler suffixesRoger Leigh2017-04-241-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to permit VS2017 to make use of the vc141 suffix or fall back to the compatible vc140 to use Boost libraries built with VS2015. Cherry picked from commit 3ca6f70f8b27c08ad3470542705701e6e8e6ea05 plus a fixup from commit 6115875bf0faef61c558e46395e67bdfd4ad48e1 for backport to CMake 3.8.
| * | FindBoost: Fix library directory for VS 2017Brad King2017-04-241-1/+1
| | | | | | | | | | | | Boost 1.64 now names the library directory `14.1`, not `15.0`.
* | | Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
|\ \ \ | |/ / |/| |
| * | CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docsDomen Vrankar2017-04-201-0/+13
| |/ | | | | | | | | | | | | Missing documentation for an already existing CPackRPM source rpm packages feature. Fixes #16814
* | Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
|\ \
| * | FindBoost: Restore tolerance of backslashes in pathsAlex Turbov2017-04-191-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of prebuilt binaries on Windows, 2016-12-21) we pass input paths through `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more places than before. This broke tolerance of backslashes in paths provided by the user due to the macro argument re-parsing. Turn `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a function instead of macro to avoid re-parsing of macro arguments. Fixes: #16816
* | FindOpenSSL: Add more library name alternativesAlex Turbov2017-04-191-0/+4
|/ | | | | | Add names found in OpenSSL 1.1.0 builds from [1]. [1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
* Merge branch 'vs-rc-defines' into releaseBrad King2017-04-101-0/+4
|\
| * RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advancedBrad King2017-04-101-0/+4
| | | | | | | | | | | | These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be advanced as they are for other languages.
* | FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
| | | | | | | | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
* | Merge branch 'mac-implicit-link-no-lto-flag' into releaseBrad King2017-04-031-1/+9
|\ \
| * | CMakeParseImplicitLinkInfo: Ignore ld -lto_library flagBrad King2017-04-031-1/+9
| | | | | | | | | | | | | | | | | | | | | The `ld` tool in Xcode 8.3 now has a `-lto_library <path>` flag. Ignore the flag instead of accidentally parsing it as `-l` with `to_library`. Fixes: #16766
* | | Merge branch 'intel-compile-features' into releaseBrad King2017-03-311-1/+3
|\ \ \
| * | | Features: Update features for Intel C++ 17.0.2 on UNIXBrad King2017-03-311-1/+3
| |/ / | | | | | | | | | | | | | | | | | | Intel 17.0.2 on UNIX introduced a regression from 17.0.1 in its definition of `__cpp_constexpr` in `-std=c++14` mode. It incorrectly defines it as `200704` instead of the expected `201304`. Fix our feature detection table to account for this.
* | | ExternalProject: Fix regression in GIT_TAG with remote branch nameBrad King2017-03-311-1/+4
|/ / | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc2~7^2 (ExternalProject: Run `git checkout` with `--` to clarify arguments, 2017-02-24) broke the case of `GIT_TAG some-remote-branch` because an explicit `--` means that the preceding argument is a tree-ish instead of a branch. Revert the change and leave a comment. Fixes: #16763
* | Merge branch 'FindBoost-1.64-deps' into releaseBrad King2017-03-301-0/+1
|\ \
| * | FindBoost: Update 1.64 dependencies using 1.64 beta1Roger Leigh2017-03-301-0/+1
| | |
* | | Merge branch 'sdcc-compiler-id' into releaseBrad King2017-03-291-2/+8
|\ \ \
| * | | SDCC: Fix identification of current sdcc compilerBrad King2017-03-291-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | The sdcc compiler no longer defines the `SDCC` preprocessor macro. Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are defined. Use them instead if defined. Issue: #16746
* | | Merge branch '16742-swift-3.0' into releaseBrad King2017-03-291-1/+7
|\ \ \
| * | | Swift: Default to Swift 3.0 with Xcode 8.3 and laterGregor Jasny2017-03-281-1/+7
| |/ / | | | | | | | | | | | | | | | | | | Xcode 8.3 has dropped support for Swift 2.3 so that compiler and feature detection failed. Closes #16742
* | | Merge branch 'vs-rc-defines' into releaseBrad King2017-03-292-1/+19
|\ \ \ | | |/ | |/|
| * | MSVC: Restore _DEBUG preprocessor definition in RC debug buildsBrad King2017-03-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.8.0-rc1~304^2 (MSVC: Do not define _DEBUG explicitly when using /MDd, 2016-11-15) we removed the `_DEBUG` preprocessor definition from MSVC C and C++ flags because the `cl` compiler automatically defines it in Debug builds anyway. However, the VS generators propagate C preprocessor definitions to the RC (Windows Resource Compiler) tool. This means that we used to explicitly define `_DEBUG` for RC debug builds. Therefore existing project code may expect the definition to be there even though the `rc` compiler itself does not implicitly define `_DEBUG` in debug builds. Add the `_DEBUG` flag to the default `CMAKE_RC_FLAGS_DEBUG` instead to restore this definition for RC debug builds. This also makes it available consistently in VS, Ninja, and Makefile generators. Fixes: #16745
| * | RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cacheBrad King2017-03-281-1/+16
| |/
* | Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-271-7/+19
|\ \
| * | InstallRequiredSystemLibraries: Find VS 2017 redist directoryBrad King2017-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Use our undocumented `cmake_host_system_information` query to find the VS 2017 installation directory by asking the VS installer tool. Then look relative to that for the redist directory. Fixes: #16737
| * | InstallRequiredSystemLibraries: Split VS 2017 search pathsBrad King2017-03-271-7/+14
| | | | | | | | | | | | | | | | | | VS 2017 does not have the same registry entries or other paths we search for other VS versions. Split the search code paths to treat it separately.
* | | CPack/RPM can now generate a single debuginfo packageDomen Vrankar2017-03-271-8/+0
| |/ |/| | | | | | | | | | | CMake 3.8 introduced possibility of generating a single debuginfo package even if component packaging is enabled so this note no longer applies.
* | Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into releaseBrad King2017-03-231-2/+2
|\ \
| * | CPack/RPM: fix error message associated with source path lengthDaniel Black2017-03-231-2/+2
| | |
* | | Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-231-69/+109
|\ \ \ | | |/ | |/|
| * | InstallRequiredSystemLibraries: Add support for VS 2017Brad King2017-03-231-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*` directories but still uses version number `140` in the DLL names. The redist directories now have version numbers in their name, and the MSVC and MFC runtime DLLs may be in directories with different versions. Fill out our logic to handle this. For now assume we are given the `MSVC_REDIST_DIR` value as a cache entry. Unfortunately we cannot yet find the VS 2017 MSVC redist directory automatically since there is no registry entry for the VS installation. Later we will have to use `cmVSSetupHelper` for this. Issue: #16735
| * | InstallRequiredSystemLibraries: Split MFC redist dir variableBrad King2017-03-231-3/+5
| | |
| * | InstallRequiredSystemLibraries: Split VS IDE and DLL versionsBrad King2017-03-231-66/+86
| | | | | | | | | | | | Refactor MSVC logic to split the IDE and DLL version variables.
* | | Merge branch 'InstallRequiredSystemLibraries-refactor' into releaseBrad King2017-03-231-179/+176
|\ \ \ | |/ /
| * | InstallRequiredSystemLibraries: Drop version from variable namesBrad King2017-03-221-122/+123
| | | | | | | | | | | | | | | | | | Each `MSVC${v}_*_DIR` variable is only ever used with one value for `${v}` within a given build tree. Drop the `${v}` version component from the variable names.
| * | InstallRequiredSystemLibraries: Refactor to avoid macrosBrad King2017-03-221-58/+54
| | | | | | | | | | | | | | | | | | For a given `MSVC_VERSION` our macros were each called at most once. Replace them with a single code path that is parameterized over what was the macro argument.
generated by cgit v0.12 at 2024-12-29 11:00:54 (GMT)