Commit Graph

34771 Commits

Author SHA1 Message Date
Brad King cb4e731347 Merge branch 'sdcc-compiler-id' into release 2017-03-29 13:22:06 -04:00
Brad King 5695558f4a SDCC: Fix identification of current sdcc compiler
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
2017-03-29 13:21:49 -04:00
Brad King 6ca509e7c6 Merge branch '16742-swift-3.0' into release 2017-03-29 10:40:59 -04:00
Gregor Jasny 77139e320c Swift: Simplify mixed test case to make it version agnostic
Issue: #16742
2017-03-29 15:36:05 +02:00
Brad King d4a995750a Merge branch 'vs-rc-defines' into release 2017-03-29 09:24:29 -04:00
Gregor Jasny c03141c04c Swift: Default to Swift 3.0 with Xcode 8.3 and later
Xcode 8.3 has dropped support for Swift 2.3 so that compiler and
feature detection failed.

Closes #16742
2017-03-28 16:06:29 -04:00
Brad King fff34934e7 MSVC: Restore _DEBUG preprocessor definition in RC debug builds
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
2017-03-28 13:10:56 -04:00
Brad King 79a915383f RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache 2017-03-28 13:10:55 -04:00
Brad King c77194ec47 VS: Honor preprocessor definitions in RC flags
The VS generators use the C (or CXX) preprocessor definitions for
the Windows Resource Compiler tool.  This causes definitions parsed
out of `CMAKE_RC_FLAGS[_<CONFIG>]` variables to be dropped.  Fix
the implementation to preserve both.

Issue: #16745
2017-03-28 13:10:55 -04:00
Brad King 1449f6f63d cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs 2017-03-28 13:10:55 -04:00
Brad King 8a619e8c85 cmIDEOptions: Add GetDefines method 2017-03-28 13:10:55 -04:00
Brad King 85abc5f5aa Merge branch 'libarchive-backport-zip-dir-fix' into release 2017-03-27 16:53:55 -04:00
Brad King 9dfccdc227 libarchive: backport zip directory recognition fix
Backport upstream libarchive commit 2ecf8d1c1e (Try harder to detect
directories in zip archives, 2016-12-23).

Fixes: #16741
2017-03-27 16:53:20 -04:00
Brad King 8c94f5085d Merge branch 'ninja-fix-sysconf-non-limit' into release 2017-03-27 13:42:30 -04:00
Christian Pfeiffer 92fe00d33c Ninja: Fix command line limit when sysconf has no ARG_MAX
The `sysconf(3)` manual explains that the return value can be `-1` for
limits if there is no definite limit.  Recognize this case and skip
using the value as a limit candidate.  Otherwise we use response files
unconditionally on such systems instead of checking other limits.

Fixes: #16740
2017-03-27 13:42:19 -04:00
Brad King 3ed87b7ee1 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-27 11:50:36 -04:00
Brad King 6eb609fd59 InstallRequiredSystemLibraries: Find VS 2017 redist directory
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
2017-03-27 11:43:01 -04:00
Brad King cf784d9ff5 Add undocumented CMake language means to find VS 2017
Add a query to the `cmake_host_system_information` command to get
the location of a VS 2017 installation.  Leave it undocumented and
for internal use for now.
2017-03-27 11:43:01 -04:00
Brad King 082c0375d9 InstallRequiredSystemLibraries: Split VS 2017 search paths
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.
2017-03-27 11:43:01 -04:00
Brad King 16cd860068 Merge branch 'cpack-rpm-tests-handle-build-id-links' into release 2017-03-27 09:08:39 -04:00
Domen Vrankar 4ba065b22b CPack/RPM tests: handle build-id links
Build id links generation was introduced
in rpm 4.13.0.1 so files related to them
should be ignored as they are not relevant
for the tests.

Fixes #16710
2017-03-27 09:08:24 -04:00
Brad King 2b350775d2 Merge branch 'cpack-rpm-debuginfo-docs-cleanup' into release 2017-03-27 08:57:40 -04:00
Domen Vrankar 1e0fc68501 CPack/RPM can now generate a single debuginfo package
CMake 3.8 introduced possibility of
generating a single debuginfo package
even if component packaging is enabled
so this note no longer applies.
2017-03-27 08:57:33 -04:00
Brad King 3b7f19a72f CMake 3.8.0-rc3 v3.8.0-rc3 2017-03-24 08:47:13 -04:00
Brad King 1adbe223cd Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into release 2017-03-23 13:48:17 -04:00
Daniel Black 8dc23a4380 CPack/RPM: fix error message associated with source path length 2017-03-23 13:47:58 -04:00
Brad King 40cf5e0e07 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-23 10:43:00 -04:00
Brad King d4a693a083 InstallRequiredSystemLibraries: Add support for VS 2017
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
2017-03-23 10:30:14 -04:00
Brad King 5ed4e48128 InstallRequiredSystemLibraries: Split MFC redist dir variable 2017-03-23 10:26:52 -04:00
Brad King dbdb880af9 InstallRequiredSystemLibraries: Split VS IDE and DLL versions
Refactor MSVC logic to split the IDE and DLL version variables.
2017-03-23 10:14:50 -04:00
Brad King 324d7f5a50 Merge branch 'server-mode-fix-home-dir-check' into release 2017-03-23 08:42:51 -04:00
Brad King 51ef9bb1eb Merge branch 'InstallRequiredSystemLibraries-refactor' into release 2017-03-23 08:42:42 -04:00
Brad King b8c72c50f7 Merge branch 'avoid-MSVC-per-version-vars' into release 2017-03-23 08:42:37 -04:00
Brad King 9ab966a722 FindRuby: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King 69b9fde148 FindGTK2: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King 3fe3182247 FindBoost: Avoid mentioning discouraged MSVC##` variable 2017-03-23 08:40:34 -04:00
Brad King a2aad448e1 InstallRequiredSystemLibraries: Drop version from variable names
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.
2017-03-22 15:58:40 -04:00
Brad King 16eb58d503 InstallRequiredSystemLibraries: Refactor to avoid macros
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.
2017-03-22 15:48:34 -04:00
Brad King a259e8db8f InstallRequiredSystemLibraries: Use MSVC_VERSION instead of MSVC##
Issue: #16735
2017-03-22 12:50:10 -04:00
Tobias Hunger 8285ad511a server-mode: Make CMAKE_HOME_DIRECTORY more reliable
Make CMAKE_HOME_DIRECTORY detection work more reliably in the face
of symlinks.

Closes #16736
2017-03-22 17:31:02 +01:00
Brad King d2fb1264d7 Merge branch 'doc-prefer-MSVC_VERSION' into release 2017-03-22 11:28:31 -04:00
Brad King 4fbae41f88 Merge branch 'FindwxWidgets-vs-2017' into release 2017-03-22 11:28:25 -04:00
Brad King fecf846701 Help: Document preference of MSVC_VERSION over MSVC##
Issue: #16735
2017-03-22 11:24:54 -04:00
Brad King 712452e330 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
Issue: #16735
2017-03-22 11:24:46 -04:00
Brad King 49a60b70e7 MSVC: Exclude future cl 20+ from MSVC14 variable 2017-03-22 11:23:37 -04:00
Brad King 8f207df14d FindwxWidgets: Add support for VS 2017 v141 toolset
Issue: #16735
2017-03-22 11:08:05 -04:00
Brad King 73f7d26682 FindwxWidgets: Use MSVC_VERSION instead of MSVC## 2017-03-22 11:08:05 -04:00
Brad King 352b195f87 Merge branch 'FindBoost-1.64' into release 2017-03-22 10:50:33 -04:00
Mateusz Łoskot 9b2f8a82e5 FindBoost: Update support for 1.64
Update the Boost library name mangling used for VS 2017 to match a
change made to Boost upstream (vc1410 => vc141).
2017-03-22 10:49:17 -04:00
Brad King 5b311041f3 Merge branch '16624-blas-lapack-documentation' into release 2017-03-22 09:10:40 -04:00