Brad King
0dc9e88d76
cmTarget: Remove 'head' argument from GetLinkImplementation
...
Many of the 'head' arguments added by commit v2.8.11~289^2~1 (Make
linking APIs aware of 'head' target, 2013-01-04) turned out not to be
needed. The "link implementation" of a target never needs to be
computed with anything but itself as the 'head' target (except for
CMP0022 OLD behavior because then it is the link interface).
Remove the unused 'head' target paths. Add "internal" versions of
cmTarget::GetDirectLinkLibraries and GetLinkImplementationLibraries
to support the CMP0022 OLD behavior without otherwise exposing the
'head' target option of these methods.
2014-06-23 09:17:00 -04:00
Brad King
4ac72455fd
cmTarget: Drop 'head' argument from GetLinkClosure
...
It is only ever passed the 'this' target itself.
2014-06-23 09:14:45 -04:00
Brad King
bcdb7ff9df
cmTarget: Remove 'head' argument from GetLinkerLanguage
...
It is only ever called with the 'this' target as the head.
Co-Author: Stephen Kelly <steveire@gmail.com>
2014-06-23 09:14:45 -04:00
Brad King
bd9b667bbe
cmComputeLinkInformation: Remove 'head' argument
...
It is only ever constructed with the current target as its own 'head'.
Co-Author: Stephen Kelly <steveire@gmail.com>
2014-06-23 09:14:45 -04:00
Brad King
06328dd58e
cmTarget: Remove 'head' argument from GetLinkInformation
...
No call sites use it anyway.
Co-Author: Stephen Kelly <steveire@gmail.com>
2014-06-23 09:14:45 -04:00
Brad King
56aed7005a
cmTarget: Cache GetLinkImplementationClosure results
...
Store them internally and return by reference to avoid duplicate
computation.
2014-06-23 09:14:44 -04:00
Brad King
cbf689c7dd
cmTarget: Rename Get{TransitiveTarget => LinkImplementation}Closure
...
The method computes the transitive closure of targets starting with
the current target link implementation libraries. Clarify the name.
2014-06-23 09:14:44 -04:00
Brad King
2f0004c143
cmTarget: Remove 'head' argument from GetTransitiveTargetClosure
...
The method is never called with any headTarget besides "this".
2014-06-23 09:14:44 -04:00
Brad King
962f2c3529
cmComputeLinkDepends: Simplify CheckWrongConfigItem implementation
...
Combine the outer two if() conditions into a single one with &&.
2014-06-23 09:14:44 -04:00
Brad King
e838e0a977
cmTarget: Simplify processILibs implementation
...
Combine the outer two if() conditions into a single one with &&.
Scope inner lookup result inside its condition.
2014-06-23 09:14:43 -04:00
Brad King
7b85938973
cmComputeTargetDepends: Remove unused 'linking' argument
...
The AddInterfaceDepends method is never called with a non-true value for
its 'linking' argument. Drop it.
2014-06-23 08:50:08 -04:00
Brad King
8d15a1bbfb
cmTarget: De-duplicate library list expansion
...
Create an ExpandLinkItems method to handle evaluation of generator
expressions in a library list and expansion of the ;-list into a vector.
Replace some duplicate copies of the implementation with calls to the
new helper.
2014-06-23 08:50:08 -04:00
Brad King
6354df92b1
cmTarget: Remove unused GetInterfaceLinkLibraries method
2014-06-23 08:50:08 -04:00
Brad King
b1380ccc4b
Merge branch 'release'
2014-06-10 13:14:38 -04:00
Brad King
487b6ccdcd
Merge topic 'WriteCompilerDetectionHeader-compiler-versions'
...
ddec418a
Features: Add compiler version support to WriteCompilerDetectionHeader.
b7029576
Project: Add configurable name for version computation macros.
78acaafe
Project: Separate simulated compiler id from version detection.
567af1a5
WCDH: Issue a better message for version compatibility.
2014-06-10 09:17:43 -04:00
Brad King
e0471ae2f9
Merge topic 'no-parse-directory'
...
b1c113d9
cmake: Do not open directories as scripts (#14966 )
2014-06-10 09:17:41 -04:00
Brad King
2944bf164e
Merge topic 'android-platform'
...
42f74df6
Add basic Android platform module
2014-06-10 09:17:39 -04:00
Brad King
f1b91a8af6
Merge topic 'vs10-refactor'
...
1edaef39
VS: Factor MS-tool-specific vcxproj settings into helper
808f4b1f
VS: Re-order logic to group MS-tool-specific options together
13e6d559
VS: Set some options directly instead of using flag map
8f4bdcc6
VS: Remove always-true condition on compile options block
eaa9f2f8
VS: Refactor internal generator factory logic
2b3e7b6f
VS: Fix vcxproj specification of empty output file extension
39af06e7
VS: Fix vcxproj elements specifying binary output locations
ee329d54
VS: Refactor flag table lookup
2014-06-10 09:17:36 -04:00
Brad King
0c73273b1a
Merge topic 'dev/static-regex'
...
1b003c1f
cmTarget: Remove an unused variable
7492a7b8
regex: Search on strings where possible
3e7194a2
regex: Use static regexs where possible
2014-06-10 09:17:35 -04:00
Kitware Robot
58f8e6bc5c
CMake Nightly Date Stamp
2014-06-10 00:01:20 -04:00
Stephen Kelly
ddec418a8f
Features: Add compiler version support to WriteCompilerDetectionHeader.
2014-06-09 23:42:20 +02:00
Brad King
5f18b28916
Merge topic 'FindOpenGL-target'
...
4883813f
Help: Add notes for topic 'FindOpenGL-target'
2014-06-09 16:26:57 -04:00
Brad King
b1c113d9a7
cmake: Do not open directories as scripts ( #14966 )
...
Check if a file path is a directory before opening it. Extend the
RunCMake.CommandLine test with a case running "cmake -P" on a directory.
2014-06-09 16:21:11 -04:00
Ben Boeckel
1b003c1f95
cmTarget: Remove an unused variable
2014-06-09 14:45:35 -04:00
Ben Boeckel
7492a7b846
regex: Search on strings where possible
2014-06-09 14:45:35 -04:00
Ben Boeckel
3e7194a215
regex: Use static regexs where possible
...
Rather than declaring and compiling a constant regex every time a chunk
of code is executed, build the regex once.
2014-06-09 14:45:35 -04:00
Brad King
4883813f49
Help: Add notes for topic 'FindOpenGL-target'
2014-06-09 11:19:25 -04:00
Brad King
1edaef39f1
VS: Factor MS-tool-specific vcxproj settings into helper
...
Factor a WriteMSToolConfigurationValues helper method out of the
cmVisualStudio10TargetGenerator::WriteProjectConfigurationValues method
to isolate the configuration settings specific to MS tools.
2014-06-09 11:00:03 -04:00
Brad King
808f4b1fa4
VS: Re-order logic to group MS-tool-specific options together
2014-06-09 11:00:01 -04:00
Brad King
13e6d5595f
VS: Set some options directly instead of using flag map
...
Instead of passing /TC, /TP, and /STACK: as strings to be parsed through
the flag map, directly set the results in the options map.
2014-06-09 10:59:59 -04:00
Brad King
8f4bdcc6cb
VS: Remove always-true condition on compile options block
...
The cmVisualStudio10TargetGenerator::ComputeClOptions method is
only called when the target type compiles, so do not duplicate
that check in the implementation.
2014-06-09 10:59:57 -04:00
Brad King
eaa9f2f8ee
VS: Refactor internal generator factory logic
...
Consume the space before the platform name as soon as possible
instead of including it in the comparison.
2014-06-09 10:59:55 -04:00
Brad King
2b3e7b6f94
VS: Fix vcxproj specification of empty output file extension
...
When a binary output file is to have no extension, the TargetExt
element in the vcxproj cannot be left empty because VS will choose
a default extension. Instead use "." because the Windows filesystem
will treat that as an empty extension.
2014-06-09 10:59:53 -04:00
Brad King
39af06e7f7
VS: Fix vcxproj elements specifying binary output locations
...
Fix generation of OutDir, IntDir, TargetName, and TargetExt element
values to encode the values for XML.
2014-06-09 10:59:51 -04:00
Brad King
ee329d543c
VS: Refactor flag table lookup
...
In cmVisualStudio10TargetGenerator, convert the static functions
currently used to lookup the flag table for each tool into class
methods. This avoids passing the this->LocalGenerator member and
gives the methods access to other information that may be useful
in the future.
2014-06-09 10:59:48 -04:00
Brad King
55d6aa36a5
CMake 3.0.0
2014-06-09 10:51:47 -04:00
Brad King
9e8fa1043c
Merge branch 'release'
2014-06-09 10:51:19 -04:00
Brad King
f25a301f3a
Merge branch 'hpux-libarchive-compile' into release
2014-06-09 10:39:00 -04:00
Rolf Eike Beer
4189a7f9a6
libarchive: fix compilation on newer HP-UX versions
...
Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a
different struct for the timing information.
Suggested-by: Eric Berge <ericmberge@gmail.com>
2014-06-09 10:38:11 -04:00
Brad King
51775851f1
Merge topic 'hpux-libarchive-compile'
...
4189a7f9
libarchive: fix compilation on newer HP-UX versions
2014-06-09 10:37:19 -04:00
Brad King
f56e74ef56
Merge topic 'hpux-libarchive-compile'
...
c1ddd77d
libarchive: Fix compilation on Tru64 with F_SETTIMES
2014-06-09 10:36:13 -04:00
Brad King
c1ddd77d0c
libarchive: Fix compilation on Tru64 with F_SETTIMES
...
The parent commit left a typo in the conditional code path for Tru64.
Add the missing '.'.
2014-06-09 10:36:41 -04:00
Brad King
074ac5dbe9
Merge topic 'WriteCompilerDetectionHeader-deprecated-define'
...
62863106
WCDH: Add compatibility defines for deprecation.
2014-06-09 10:28:45 -04:00
Brad King
a0861931ea
Merge topic 'dev/backtrace-performance'
...
86be733f
cmGeneratorExpression: Add workaround for Borland compiler
3495ab0a
tests: update unused variable test expected output
2a1b2d84
backtrace: Convert to local paths in IssueMessage
a0829205
genex: remove the need for backtraces
efc20569
cmake: remove dummy backtraces for IssueMessage
d46c650d
cmMakefile: return a backtrace
2014-06-09 10:28:44 -04:00
Brad King
3c0652f8bf
Merge topic 'testRST-no-preprocessor-FILE'
...
218699eb
Tests: Fix CMakeLib.testRST for relative __FILE__
2014-06-09 10:28:42 -04:00
Brad King
8c29d8d1e7
Merge topic 'hpux-libarchive-compile'
...
478b1c8b
libarchive: fix compilation on newer HP-UX versions
2014-06-09 10:28:40 -04:00
Brad King
d20792f302
Merge topic 'windows-RC-extension'
...
514c2e3d
CMakeRCCompiler: Handle uppercase 'RC' as resource file format extension
2014-06-09 10:28:38 -04:00
Brad King
bf022b7963
Merge topic 'xcode15-fix-RunCMake-TargetSources'
...
0366ba5d
Tests: Fix RunCMake.TargetSources on Xcode 1.5
2014-06-09 10:28:36 -04:00
Brad King
81ddcaa67b
Merge topic 'FindOpenGL-target'
...
94770baf
FindOpenGL: Fix typo in documented target name
2014-06-09 10:28:35 -04:00
Brad King
9af1f985fd
Merge topic 'fix-ctest-label-regex'
...
887532f0
CTest: Fix combined inclusive/exclusive label regular expressions
2014-06-09 10:28:33 -04:00