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
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
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
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
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
9af1f985fd
Merge topic 'fix-ctest-label-regex'
...
887532f0 CTest: Fix combined inclusive/exclusive label regular expressions
2014-06-09 10:28:33 -04:00
Kitware Robot
2649d79470
CMake Nightly Date Stamp
2014-06-09 00:01:06 -04:00
Kitware Robot
c4fe537562
CMake Nightly Date Stamp
2014-06-08 00:01:07 -04:00
Kitware Robot
fc7d878616
CMake Nightly Date Stamp
2014-06-07 00:01:14 -04:00
Brad King
42f74df6d4
Add basic Android platform module
...
Create a Platform/Android module that includes Platform/Linux since
Android is based on Linux. Provide only the minimal settings needed to
get builds with Android NDK toolchains to work.
Disable use of RPATH since the Android loader ignores it and we cannot
predict the install destination anyway.
Android supports soname but shared library names must end in ".so" and
we cannot represent the versioned names with associated symlinks on all
host operating systems anyway. However, we do want the SONAME of
library files to be set so that linking to them by path to the library
file produces NEEDED entries with the soname and not the path. Add a
new CMAKE_PLATFORM_NO_VERSIONED_SONAME setting to tell the
cmTarget::GetLibraryNames method that not to use the VERSION or
SOVERSION target properties in the soname.
2014-06-06 14:03:42 -04:00
Brad King
86be733fa5
cmGeneratorExpression: Add workaround for Borland compiler
2014-06-06 09:51:33 -04:00
Brad King
c6e7c18bcc
Merge topic 'xcode-15-string-apis'
...
23dc6aa1 Xcode: Fix single-configuration generation for version 1.5
2014-06-06 09:44:55 -04:00
Brad King
09c5fdfaa3
Merge topic 'compile-OBJECT_FILE_DIR'
...
8256ccb7 Add OBJECT_FILE_DIR rule placeholder for compilation lines
2014-06-06 09:44:53 -04:00
Nils Gladitz
887532f0f0
CTest: Fix combined inclusive/exclusive label regular expressions
2014-06-06 10:28:18 +02:00
Kitware Robot
47cde18849
CMake Nightly Date Stamp
2014-06-06 00:01:08 -04:00
Ben Boeckel
2a1b2d8486
backtrace: Convert to local paths in IssueMessage
...
This is the only place we care show the FilePath to the user, so defer
the expensive relative path calculation until here.
2014-06-05 12:44:19 -04:00
Ben Boeckel
a08292059e
genex: remove the need for backtraces
...
Rather than making dummy backtraces and passing them around, just make
backtraces optional.
2014-06-05 12:44:18 -04:00
Ben Boeckel
efc205695d
cmake: remove dummy backtraces for IssueMessage
2014-06-05 12:44:17 -04:00
Ben Boeckel
d46c650d67
cmMakefile: return a backtrace
...
This allows backtraces to be fully controlled by the makefile rather
than externally (and makes changing how they are manipulated easier).
2014-06-05 12:44:04 -04:00
Brad King
88818b6805
Merge topic 'delay-generator-toolset'
...
528e8af1 Allow a toolchain file to specify a generator toolset
98afb454 VS: Split user- and generator-provided PlatformToolset
3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset
2014-06-05 11:31:00 -04:00
Brad King
2db73edc5c
Merge topic 'fix-ctest-option-summary'
...
6446eb09 CTest: Added option description for --output-on-failure
2014-06-05 10:55:31 -04:00
Brad King
994f4b71fc
Merge topic 'expand_cobertura_coverage'
...
50daf239 CTest: Generalize Cobertura coverage format handling
a2822d30 CTest: Rename coverage implementation for "Python" to "Cobertura"
2014-06-05 10:55:29 -04:00
Brad King
5d360f23fa
Merge topic 'setlocale'
...
730e3862 Encoding: Add setlocale() to applications.
2014-06-05 10:55:27 -04:00
Nils Gladitz
6446eb099a
CTest: Added option description for --output-on-failure
...
Without it the option list is cut short after --debug.
2014-06-05 10:51:39 -04:00
Brad King
23dc6aa194
Xcode: Fix single-configuration generation for version 1.5
...
In commit 84fdc992 (stringapi: Pass configuration names as strings,
2014-02-09) a few code paths for the Xcode 1.5 single-configuration
generator were not updated to use an empty configuration name instead of
a NULL pointer when no configuration is specified in CMAKE_BUILD_TYPE.
Fix them now.
2014-06-05 09:43:13 -04:00