Commit Graph

33292 Commits

Author SHA1 Message Date
Brad King 1e6aaefdee Merge topic 'clean-up-link-configuration'
a1cfc4fe cmMakefile: Simplify programmer error to an assert
4079ba20 cmMakefile: Implement LinkLibraries as an internal property
17ab8e33 cmMakefile: Inline method into only remaining caller
7edfcd0e cmMakefile: Inline method into caller
6c8dc7f1 cmake: Simplify find-package mode library addition
1efca9f4 cmMakefile: Remove obsolete parameter
d9b5f0a3 cmTarget: Remove target name from parameter list
1c70c6cc cmMakefile: Use public API to find a target
2b7baed7 cmMakefile: Inline method into only caller
7ba95492 cmMakefile: Use public API to find a target
6d98b15f cmMakefile: Invert if() condition to remove else
869037ee cmMakefile: Remove ALIAS check
2f6462a6 cmMakefile: Collapse two consecutive if()s into one
148b83a1 cmMakefile: DeMorgan-invert condition
4457a9f1 cmMakefile: Return after error and remove else condition
4d039c5b cmMakefile: Invert handling of error condition
...
2016-10-10 10:23:45 -04:00
Brad King ea533eb715 Merge topic 'ninja-cleanups'
cc5e6b82 Ninja: Extract identical code from condition
d9fde87d Ninja: Replace array access with local variable
d92c160d Ninja: Separate two coupled calls
2016-10-10 10:23:42 -04:00
Brad King 8fe948c54c Merge topic 'minor-cleanups'
c637e0c5 cmMakefile: Return a string from GetDefineFlags
fbc1b75c Test: Remove condition for CMake version no longer supported
3d0e95f6 cmLocalGenerator: Extract definition retrieval out of loop
2a49d86d Makefiles: Inline only use of method
b0301db2 Makefiles: Make helper class independent of cmLocalGenerator
267e0209 cmMakefile: Remove pointless condition
009019f2 Makefiles: Extract identical code from condition
378849f4 Makefiles: Replace array access with local variable
4a3c49b4 Makefiles: Separate two coupled calls
2016-10-10 10:23:39 -04:00
Brad King 9c7fc00a45 Merge topic 'cmake-cleanup'
326d5fa7 Allow custom built libarchive to use custom built expat.
7d45db99 Don't require liblzma when using system libarchive
a28b8f95 Don't require libbz2 when using system libarchive
66c6144c CMakeCPack: remove obsolete conditions
2016-10-10 10:23:36 -04:00
Brad King 211e3223a6 Merge topic 'test-cpack-improve-failure-messages'
7f90d5e5 Tests: Improve RunCMake.CPack_* failure message formatting
2016-10-10 10:23:33 -04:00
Brad King e8cdbec45e Merge topic 'update-kwsys'
c22f3cf7 Merge branch 'upstream-KWSys' into update-kwsys
bf28a387 KWSys 2016-10-07 (dfe9b386)
2016-10-10 10:23:30 -04:00
Brad King d3f1fcf6d1 Merge topic 'android-export-has-cpp'
dda6775c Android: Record use of C++ by static libs in exported Android.mk files
2016-10-10 10:23:27 -04:00
Brad King 19d4f942fe Merge topic 'android-cxxabi'
8cdac469 Android: Fix support for cxxabi.h with libc++
2016-10-10 10:23:24 -04:00
Brad King ce00292134 Merge topic 'FindProtobuf-fix-subdirs'
2b9dad69 FindProtobuf: Fix protobuf_generate_*() to handle subdirs
2016-10-10 10:23:21 -04:00
Stephen Kelly c637e0c53b cmMakefile: Return a string from GetDefineFlags
Flip condition in GHS for readability.
2016-10-10 10:09:54 -04:00
Stephen Kelly fbc1b75c26 Test: Remove condition for CMake version no longer supported 2016-10-10 10:09:54 -04:00
Stephen Kelly 3d0e95f64c cmLocalGenerator: Extract definition retrieval out of loop 2016-10-10 10:09:54 -04:00
Kitware Robot e3c5aed6ae CMake Nightly Date Stamp 2016-10-10 00:01:04 -04:00
Daniel Pfeifer 326d5fa747 Allow custom built libarchive to use custom built expat.
Expat is built anyway.
2016-10-10 00:21:00 +02:00
Daniel Pfeifer 7d45db9956 Don't require liblzma when using system libarchive 2016-10-10 00:12:34 +02:00
Daniel Pfeifer a28b8f95bc Don't require libbz2 when using system libarchive 2016-10-10 00:08:06 +02:00
Daniel Pfeifer 66c6144cda CMakeCPack: remove obsolete conditions
The file contains some conditions depending on the existence of CMake
modules.  This basically checks for CMake versions that are no longer
supported.  Remove the conditions.
2016-10-09 23:59:15 +02:00
Stephen Kelly 2a49d86d5d Makefiles: Inline only use of method 2016-10-09 10:47:44 +02:00
Stephen Kelly b0301db23b Makefiles: Make helper class independent of cmLocalGenerator
It only needs output conversion.
2016-10-09 10:47:44 +02:00
Stephen Kelly 267e02097e cmMakefile: Remove pointless condition
This method is never called with an empty string.
2016-10-09 10:47:44 +02:00
Stephen Kelly 009019f259 Makefiles: Extract identical code from condition 2016-10-09 10:47:43 +02:00
Stephen Kelly 378849f41e Makefiles: Replace array access with local variable 2016-10-09 10:47:43 +02:00
Stephen Kelly 4a3c49b469 Makefiles: Separate two coupled calls 2016-10-09 10:47:43 +02:00
Kitware Robot 785bfae867 CMake Nightly Date Stamp 2016-10-09 00:01:05 -04:00
Stephen Kelly cc5e6b82c2 Ninja: Extract identical code from condition 2016-10-08 11:36:02 +02:00
Brad King c22f3cf715 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-10-07 (dfe9b386)
2016-10-08 05:25:35 -04:00
KWSys Upstream bf28a3873d KWSys 2016-10-07 (dfe9b386)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit dfe9b38635d80cb5253187c1ddf90923e1b9effd (master).

Upstream Shortlog
-----------------

Brad King (1):
      dfe9b386 SystemTools: Re-implement Strucmp
2016-10-08 05:25:34 -04:00
Kitware Robot 8312fd5c1f CMake Nightly Date Stamp 2016-10-08 00:01:07 -04:00
Stephen Kelly a1cfc4fe3d cmMakefile: Simplify programmer error to an assert 2016-10-07 22:08:03 +02:00
Stephen Kelly 4079ba20d9 cmMakefile: Implement LinkLibraries as an internal property
cmMakefile should not have logic particular to individual cmake
commands.  The link_libraries() command is generally obsolete in favor
of target_link_libraries().  An alternative language for CMake probably
would not offer the former.  The quirks and historical behaviors of the
current language should be separate from the core classes of CMake to
allow replacing the language.
2016-10-07 22:07:50 +02:00
Stephen Kelly 17ab8e33f0 cmMakefile: Inline method into only remaining caller 2016-10-07 22:07:16 +02:00
Stephen Kelly d9fde87d1a Ninja: Replace array access with local variable 2016-10-07 21:37:38 +02:00
Stephen Kelly d92c160db3 Ninja: Separate two coupled calls 2016-10-07 21:37:38 +02:00
Stephen Kelly 7edfcd0e83 cmMakefile: Inline method into caller
The various uses of AddLinkLibraryForTarget are going away.  This is the
only remaining non-deprecated use.
2016-10-07 21:25:41 +02:00
Brad King dda6775c94 Android: Record use of C++ by static libs in exported Android.mk files
When a `PREBUILT_STATIC_LIBRARY` uses C++ in its sources then the `.a`
file will have a link-time dependency on the C++ runtime libraries.
Android NDK r14 will add a way to give this information to the NDK build
system by adding a `LOCAL_HAS_CPP` setting to the `Android.mk` file.
Add this for exported static libraries that use C++.
2016-10-07 15:02:42 -04:00
Stephen Kelly 6c8dc7f1df cmake: Simplify find-package mode library addition
It does not need the cmMakefile version.
2016-10-07 20:23:19 +02:00
Stephen Kelly 1efca9f427 cmMakefile: Remove obsolete parameter 2016-10-07 20:13:36 +02:00
Stephen Kelly d9b5f0a301 cmTarget: Remove target name from parameter list
Use the member state instead.
2016-10-07 20:13:36 +02:00
Stephen Kelly 1c70c6cc09 cmMakefile: Use public API to find a target 2016-10-07 20:13:35 +02:00
Stephen Kelly 2b7baed719 cmMakefile: Inline method into only caller
cmMakefile should not have API which is only useful for deprecated
systems like cmPluginAPI.
2016-10-07 20:13:35 +02:00
Stephen Kelly 7ba954925a cmMakefile: Use public API to find a target 2016-10-07 20:13:35 +02:00
Stephen Kelly 6d98b15fc8 cmMakefile: Invert if() condition to remove else 2016-10-07 20:13:35 +02:00
Stephen Kelly 869037ee86 cmMakefile: Remove ALIAS check
This method is only called from the cmPlugin API, which predates ALIAS
targets and is obsolete.
2016-10-07 20:13:35 +02:00
Stephen Kelly 2f6462a634 cmMakefile: Collapse two consecutive if()s into one 2016-10-07 20:13:34 +02:00
Stephen Kelly 148b83a121 cmMakefile: DeMorgan-invert condition 2016-10-07 20:13:34 +02:00
Stephen Kelly 4457a9f181 cmMakefile: Return after error and remove else condition 2016-10-07 20:13:34 +02:00
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