Commit Graph

33243 Commits

Author SHA1 Message Date
Stephen Kelly 4d039c5b46 cmMakefile: Invert handling of error condition 2016-10-07 20:13:34 +02:00
Stephen Kelly c8ec8d6a7e cmMakefile: Remove superfluous overload
Explicit is better than implicit.
2016-10-07 20:13:34 +02:00
Stephen Kelly 3e8d47d18b cmMakefile: Remove useless link directory container
It is never populated - a find will never find anything.
2016-10-07 20:13:33 +02:00
Stephen Kelly 3b4895fa35 cmTarget: Inline MergeLinkLibraries into only caller 2016-10-07 20:13:33 +02:00
Stephen Kelly 2232e97a6e cmTarget: Remove useless link library state 2016-10-07 20:13:33 +02:00
Stephen Kelly 9a1d4e4ba1 cmTarget: Remove addition of zero when merging link libraries
The size is always zero when this is called.
2016-10-07 20:13:33 +02:00
Stephen Kelly 8391b3015a cmTarget: Add assert about link data
MergeLinkLibraries is called only from

 cmMakefile::AddGlobalLinkInformation

which is only called immediately after creating a target.
2016-10-07 20:13:32 +02:00
Brad King 7a1e542ed7 Merge branch 'release' 2016-10-07 09:24:35 -04:00
Brad King b4fab15fc7 Merge topic 'nmake-encoding'
c666f8cb NMake: Use ANSI encoding for NMake Makefiles
f00214aa cmGeneratedFileStream: Add optional encoding support
bb1d3370 codecvt: Add class for encoding conversion
2016-10-07 09:22:08 -04:00
Brad King cb5cadf3c7 Merge topic 'cpack-rpm-single-debuginfo'
bb8cf521 CPack/RPM single debuginfo packaging
758f58b4 CPack/RPM learned defining main component
2016-10-07 09:22:04 -04:00
Domen Vrankar bb8cf52156 CPack/RPM single debuginfo packaging
Generate a single debuginfo package even
if components packaging is enabled.

This makes issue #15668 resolution feature complete.

Closes: #15486
2016-10-07 09:19:04 -04:00
Domen Vrankar 758f58b4a1 CPack/RPM learned defining main component
Main component rpm package is generated
without component suffix in filename
and package name.
2016-10-07 09:19:04 -04:00
Brad King 9c4d105680 Merge topic 'cleanup-Convert'
20e62f74 cmLocalGenerator: Simplify ConvertToLinkReference
fd93b360 cmOutputConverter: Add a flag for IsUnix
1365e18b Convert: Inline platform-specific methods
1ed5f6b3 Makefiles: Introduce local RelativePath method
8377d9e0 Fortran: Inline conversion to relative path
00173b71 Fortran: Wrap path convert in a call with a more-suitable name
d5911ef0 Makefiles: Hardcode the relative location of the CMakeCache file
c3264f48 Convert: Extract method to determine if paths are in directory
52168f32 Convert: Remove asserts which are duplicated in delegate method
5213f893 Convert: Remove early return check
b61c268b Convert: Extract local variables for readability
e278f5a8 Convert: Extract local variables
51bc6bdd cmOutputConverter: remove unused code
8e0c1599 Xcode: Inline ConvertToRelativePath calls
2016-10-07 09:10:57 -04:00
Brad King 89b03498ef Merge topic 'CMP0065-LINK_FLAGS'
0f1fedbd CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
7f1cd328 cmLocalGenerator: Rename local variable to be more appropriate
2597bcf8 cmLocalGenerator: Extract policy handling into a method
2016-10-07 09:10:54 -04:00
Brad King f7fc93281b Merge topic 'codelite-global-setting'
80574a38 Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally
f59e8779 cmGlobalGenerator: Add API to get settings from top-level cmMakefile
2016-10-07 09:10:52 -04:00
Brad King 9e7f9bbf56 Merge topic 'android-ndk-r13'
0c3a0477 Android: Update libc++ include directories for NDK r13
ebef3632 Android: Suppress -Wattributes warnings in test case builds
2016-10-07 09:10:49 -04:00
Brad King fadb812a52 Merge topic 'vs-15-preview-5'
02b7d278 VS: Update VS 15 generator for Preview 5
2016-10-07 09:10:46 -04:00
Brad King ea563a27a2 Merge topic 'mips-rld-map-rel'
15762b72 elf: Remove GetDynamicEntryCount and ReadBytes methods
cd4f573a cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath
b8b1d151 cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods
72eb6a37 elf: add DynamicEntryList methods and rpath tag constants
66c4d082 elf: remove tag switch from ELF_Dyn ByteSwap function
2016-10-07 09:10:43 -04:00
Brad King 36e07e1017 Merge topic 'cpack-rpm-debuginfo-fixes'
f53b01ff CPack/RPM debuginfo package without binaries
ca50c89e CPack/RPM debuginfo package objdump error suppression
2016-10-07 09:10:41 -04:00
Brad King 5553e330dc Merge topic 'check-libuv-minimum-version'
20e8dcf1 Set minimum version for LibUV to 1.0.0
845b98f4 Use find_package for JsonCpp and LibUV instead of include
2016-10-07 09:10:37 -04:00
Chuck Atkins 20e8dcf162 Set minimum version for LibUV to 1.0.0
Older versions of libuv did not have the uv_loop_close API.  It first
showed up in unstable releases ~ v0.11.20 but was not available in
a stable release until v1.0
2016-10-07 09:07:32 -04:00
Chuck Atkins 845b98f45b Use find_package for JsonCpp and LibUV instead of include 2016-10-07 09:07:32 -04:00
Stephen Kelly 80574a38e6 Codelite: Consume the CMAKE_CODELITE_USE_TARGETS setting globally 2016-10-07 09:01:07 -04:00
Stephen Kelly 0f1fedbd6a CMP0065: Put computed flags into LINK_FLAGS not LINK_LIBRARIES
These flags are redundant anyway in the NEW case of the policy, and
could be merged with CMAKE_EXE_EXPORTS_${lang}_FLAG content for that
case.  That is deferred to the future, but now at least the similar code
is located close to each other.
2016-10-07 08:42:25 -04:00
James Cowgill 15762b72b4 elf: Remove GetDynamicEntryCount and ReadBytes methods
These are no longer used after the DynamicEntryList changes.
2016-10-07 08:30:00 -04:00
James Cowgill cd4f573ae9 cmSystemTools, elf: handle DT_MIPS_RLD_REL_MAP in RemoveRPath 2016-10-07 08:30:00 -04:00
James Cowgill b8b1d15186 cmSystemTools: rewrite RemoveRPath using DyanmicEntryList methods 2016-10-07 08:29:59 -04:00
Kitware Robot 8c61544bb7 CMake Nightly Date Stamp 2016-10-07 00:01:16 -04:00
Brad King 02b7d278c8 VS: Update VS 15 generator for Preview 5
The `PlatformToolset` is now `v141` instead of `v140`.

Closes: #16347
2016-10-06 16:46:53 -04:00
Stephen Kelly 7f1cd3280c cmLocalGenerator: Rename local variable to be more appropriate 2016-10-06 22:25:05 +02:00
Stephen Kelly 2597bcf831 cmLocalGenerator: Extract policy handling into a method 2016-10-06 22:17:30 +02:00
Stephen Kelly 20e62f74c5 cmLocalGenerator: Simplify ConvertToLinkReference
Make conversion to output format the caller responsibility, so that the
method only 'converts to a link reference'.
2016-10-06 20:02:10 +02:00
Stephen Kelly fd93b3605b cmOutputConverter: Add a flag for IsUnix
Remove the need for method parameters to represent the distinction.
2016-10-06 20:02:10 +02:00
Stephen Kelly 1365e18b9b Convert: Inline platform-specific methods
They don't provide real value.
2016-10-06 20:02:09 +02:00
Stephen Kelly 1ed5f6b39b Makefiles: Introduce local RelativePath method
This makes it easier to remove directory-specific state from
cmOutputConverter where it doesn't belong.  Of course, this just
relocates the problem to the makefiles generator for now, but that's
better than affecting the core.
2016-10-06 20:02:08 +02:00
Stephen Kelly 8377d9e00b Fortran: Inline conversion to relative path
Don't use cmOutputConverter method which relies on directory-specific
state.
2016-10-06 20:02:08 +02:00
Stephen Kelly 00173b71d9 Fortran: Wrap path convert in a call with a more-suitable name 2016-10-06 20:02:07 +02:00
Stephen Kelly d5911ef014 Makefiles: Hardcode the relative location of the CMakeCache file
In this context, currentBinDir refers to the CMAKE_BINARY_DIR because it
comes from the first local generator.  GetHomeOutputDirectory is the
same as CMAKE_BINARY_DIR, so the computation here is unnecessary.
2016-10-06 20:02:07 +02:00
Stephen Kelly c3264f48c2 Convert: Extract method to determine if paths are in directory
The conditional early return can be moved to clients, which would have
many benefits, notably making cmOutputConverter independent of
directory-specific state.
2016-10-06 20:02:06 +02:00
Stephen Kelly 52168f3210 Convert: Remove asserts which are duplicated in delegate method
This means that we don't encounter the asserts in the case where we
early-return from here.
2016-10-06 20:02:05 +02:00
Stephen Kelly 5213f8936f Convert: Remove early return check
This function delegates to another function which does the same check.
2016-10-06 20:02:05 +02:00
Stephen Kelly b61c268bd0 Convert: Extract local variables for readability 2016-10-06 20:02:04 +02:00
Stephen Kelly e278f5a848 Convert: Extract local variables
Remove comment made obsolete by them.
2016-10-06 20:02:03 +02:00
Brad King 0c3a04777c Android: Update libc++ include directories for NDK r13
The Android NDK r13 moved the libc++ include directories.

Closes: #16346
2016-10-06 13:26:40 -04:00
Brad King ebef3632c7 Android: Suppress -Wattributes warnings in test case builds
We use `-Werror` in the Android test builds to make sure there are
no warnings that we care about (e.g. unused flags).  However, the
NDK r13 tools produce a warning about their own builtins:

```
<built-in>: In function 'float abs(float)':
<built-in>: warning: conflicts with previous declaration here [-Wattributes]
```

Suppress this warning so that we can continue using `-Werror` but
tolerate these warnings.
2016-10-06 13:26:05 -04:00
Daniel Pfeifer 51bc6bddb9 cmOutputConverter: remove unused code
Remove old ConvertToRelativePath function now that all clients have
migrated to the new signature.
2016-10-06 18:45:18 +02:00
Stephen Kelly 8e0c1599a1 Xcode: Inline ConvertToRelativePath calls
Avoid violations of Interface Segregation Principle.  These two calls
now simply call different methods.
2016-10-06 18:45:18 +02:00
Stephen Kelly f59e877929 cmGlobalGenerator: Add API to get settings from top-level cmMakefile
At generate-time, definitions are sometimes read from a nearby cmMakefile,
making the value directory-specific because they are read once per
directory.  Often however, the intention is more
often to create a 'global' setting, such that the user writes for
example:

 set(CMAKE_IMPORT_LIBRARY_SUFFIX something)

once at the top level of their project.

Many of these are also set by internal platform files, such as
CMAKE_EXTRA_LINK_EXTENSIONS.

The set() definitions are not really suitable for 'global' settings
because they can be different for each directory, and code consuming the
settings must assume they are different for each directory, and read it
freshly each time with new allocations.

CMake has other variable types which are global in scope, such as global
properties, and cache variables.  These are less convenient to populate
for users, so establish a convention and API using the value as it is at
the end of the top-level CMakeLists file.
2016-10-06 18:41:06 +02:00
James Cowgill 72eb6a374e elf: add DynamicEntryList methods and rpath tag constants 2016-10-06 16:52:36 +01:00
James Cowgill 66c4d0820c elf: remove tag switch from ELF_Dyn ByteSwap function
sizeof(dyn.d_un.d_val) always equals sizeof(dyn.d_un.d_ptr) so every byte swap
call in this function is identical.
2016-10-06 16:52:34 +01:00