c637e0c53b
cmMakefile: Return a string from GetDefineFlags
...
Flip condition in GHS for readability.
2016-10-10 10:09:54 -04:00
fbc1b75c26
Test: Remove condition for CMake version no longer supported
2016-10-10 10:09:54 -04:00
3d0e95f64c
cmLocalGenerator: Extract definition retrieval out of loop
2016-10-10 10:09:54 -04:00
e3c5aed6ae
CMake Nightly Date Stamp
2016-10-10 00:01:04 -04:00
326d5fa747
Allow custom built libarchive to use custom built expat.
...
Expat is built anyway.
2016-10-10 00:21:00 +02:00
7d45db9956
Don't require liblzma when using system libarchive
2016-10-10 00:12:34 +02:00
a28b8f95bc
Don't require libbz2 when using system libarchive
2016-10-10 00:08:06 +02:00
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
b6a174d2bc
Makefiles: Remove query for CMAKE_OBJECT_NAME
...
it is not set.
2016-10-09 10:58:33 +02:00
d0faa58a51
Makefiles: Remove forbidden flag logic
...
This might have been needed some day in the past, but not anymore.
2016-10-09 10:58:33 +02:00
2a49d86d5d
Makefiles: Inline only use of method
2016-10-09 10:47:44 +02:00
b0301db23b
Makefiles: Make helper class independent of cmLocalGenerator
...
It only needs output conversion.
2016-10-09 10:47:44 +02:00
267e02097e
cmMakefile: Remove pointless condition
...
This method is never called with an empty string.
2016-10-09 10:47:44 +02:00
009019f259
Makefiles: Extract identical code from condition
2016-10-09 10:47:43 +02:00
378849f41e
Makefiles: Replace array access with local variable
2016-10-09 10:47:43 +02:00
4a3c49b469
Makefiles: Separate two coupled calls
2016-10-09 10:47:43 +02:00
785bfae867
CMake Nightly Date Stamp
2016-10-09 00:01:05 -04:00
cc5e6b82c2
Ninja: Extract identical code from condition
2016-10-08 11:36:02 +02:00
9f240cff8a
Merge branch 'update-kwsys' into release
2016-10-08 05:28:15 -04:00
c22f3cf715
Merge branch 'upstream-KWSys' into update-kwsys
...
* upstream-KWSys:
KWSys 2016-10-07 (dfe9b386)
2016-10-08 05:25:35 -04:00
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
8312fd5c1f
CMake Nightly Date Stamp
2016-10-08 00:01:07 -04:00
a1cfc4fe3d
cmMakefile: Simplify programmer error to an assert
2016-10-07 22:08:03 +02:00
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
17ab8e33f0
cmMakefile: Inline method into only remaining caller
2016-10-07 22:07:16 +02:00
d9fde87d1a
Ninja: Replace array access with local variable
2016-10-07 21:37:38 +02:00
d92c160db3
Ninja: Separate two coupled calls
2016-10-07 21:37:38 +02:00
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
5d8da06d60
Merge branch 'android-export-has-cpp' into release
2016-10-07 15:03:15 -04:00
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
6c8dc7f1df
cmake: Simplify find-package mode library addition
...
It does not need the cmMakefile version.
2016-10-07 20:23:19 +02:00
1efca9f427
cmMakefile: Remove obsolete parameter
2016-10-07 20:13:36 +02:00
d9b5f0a301
cmTarget: Remove target name from parameter list
...
Use the member state instead.
2016-10-07 20:13:36 +02:00
1c70c6cc09
cmMakefile: Use public API to find a target
2016-10-07 20:13:35 +02:00
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
7ba954925a
cmMakefile: Use public API to find a target
2016-10-07 20:13:35 +02:00
6d98b15fc8
cmMakefile: Invert if() condition to remove else
2016-10-07 20:13:35 +02:00
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
2f6462a634
cmMakefile: Collapse two consecutive if()s into one
2016-10-07 20:13:34 +02:00
148b83a121
cmMakefile: DeMorgan-invert condition
2016-10-07 20:13:34 +02:00
4457a9f181
cmMakefile: Return after error and remove else condition
2016-10-07 20:13:34 +02:00
4d039c5b46
cmMakefile: Invert handling of error condition
2016-10-07 20:13:34 +02:00
c8ec8d6a7e
cmMakefile: Remove superfluous overload
...
Explicit is better than implicit.
2016-10-07 20:13:34 +02:00
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
3b4895fa35
cmTarget: Inline MergeLinkLibraries into only caller
2016-10-07 20:13:33 +02:00
2232e97a6e
cmTarget: Remove useless link library state
2016-10-07 20:13:33 +02:00
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
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
7f90d5e5cc
Tests: Improve RunCMake.CPack_* failure message formatting
...
Format a `message(FATAL_ERROR)` call with markup to make the generated
message more readable so that the difference between the actual and
expected results is easier to see.
2016-10-07 11:28:32 -04:00
a033f86712
Merge branch 'FindProtobuf-fix-subdirs' into release
2016-10-07 10:16:33 -04:00
Stephen Kelly