kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,314 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

13797 Commits

Author SHA1 Message Date
Brad King 7db963a017 Merge topic 'clean-include-dirs-debugging' 
6063fef Output include directories as LOG messages, not warnings.
aa66748 Specify the target whose includes are being listed.
d70204a Only output includes once after the start of 'generate-time' when debugging.
0d46e9a Store includes from the same include_directories call together.
 2013-01-23 15:11:36 -05:00
Brad King 33695c616a Merge topic 'export-new-style-files' 
02d4e53 Generate new-style cmake code during export.
 2013-01-23 15:11:32 -05:00
Brad King 7a336d2e31 Merge topic 'fix-LINK_LIBRARIES-population' 
d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
 2013-01-23 15:11:28 -05:00
Brad King a37b0e3ebf Merge topic 'qt4-autolink-qtmain' 
e3b5eb6 Automatically link to the qtmain library when linking to QtCore.
6c8d8af Add the $<TARGET_POLICY> expression
 2013-01-23 15:11:24 -05:00
Brad King bf2e4e8cb1 Merge topic 'fix-COMPATIBLE_INTERFACE-properties' 
830246e Export the COMPATIBLE_INTERFACE_BOOL content properties
bd82bb4 Clear the link information in ClearLinkMaps.
e987991 Make INTERFACE determined properties readable in generator expressions.
d9afacc Exit early if we find an inconsistent property.
1800f70 Populate the link information cache before checking dependent properties.
 2013-01-23 15:11:15 -05:00
Brad King e7be8be8c0 Merge topic 'xcode-duplicate-flags-13354' 
f447db7 XCode generator won't infinitely parse compiler flags (bug #13354).
 2013-01-23 15:11:09 -05:00
Brad King 95f88fd2a1 Merge topic 'fix-target_include_directories-genex' 
24dcf0c Make sure generator expressions can be used with target_include_directories.
 2013-01-23 15:11:04 -05:00
Brad King c4c52b3273 Merge topic 'automoc-object' 
0e35cac Automoc: add OBJECT library to QtAutomoc test
cf3faac Automoc: Fix automoc for OBJECT libraries.
 2013-01-23 15:10:39 -05:00
Stephen Kelly e3b5eb6b23 Automatically link to the qtmain library when linking to QtCore. 
When using QAxServer, ensure that the qtmain library is excluded
by reporting an error at CMake time if it is not.
 2013-01-23 14:15:41 -05:00
Kitware Robot a40c4261e6 CMake Nightly Date Stamp 2013-01-23 00:01:06 -05:00
Kitware Robot 2db9b0b066 CMake Nightly Date Stamp 2013-01-22 00:01:18 -05:00
Stephen Kelly 6063fef226 Output include directories as LOG messages, not warnings. 2013-01-21 09:12:22 +01:00
Stephen Kelly aa6674831c Specify the target whose includes are being listed. 2013-01-21 09:12:22 +01:00
Stephen Kelly d70204a86a Only output includes once after the start of 'generate-time' when debugging. 
During configure-time, GetIncludeDirectories may be called too, for example
if using the export() command. As the content can be different, it should
be output each time then.
 2013-01-21 09:12:22 +01:00
Stephen Kelly 0d46e9a029 Store includes from the same include_directories call together. 
Otherwise, we get a separate IncludeDirectoriesEntry for each include,
and that causes unnecessary and confusing splitting in the output when
debugging the INCLUDE_DIRECTORIES property.
 2013-01-21 09:12:22 +01:00
Stephen Kelly 830246e841 Export the COMPATIBLE_INTERFACE_BOOL content properties 2013-01-21 09:05:03 +01:00
Stephen Kelly bd82bb4787 Clear the link information in ClearLinkMaps. 
The cache here needs to be cleared if GetLinkInformation is called
at configure-time, such as during an export().

The next commit does exactly that, and without this patch,
the LinkLanguage test would fail.
 2013-01-21 09:05:03 +01:00
Kitware Robot 3ded614e31 CMake Nightly Date Stamp 2013-01-21 00:01:20 -05:00
Stephen Kelly 02d4e53f48 Generate new-style cmake code during export. 
Use empty end*() commands and lowercase commands.
 2013-01-20 18:05:23 +01:00
Stephen Kelly e98799105b Make INTERFACE determined properties readable in generator expressions. 
The properties are evaluated as link-dependent interface properties when
evaluating the generator expressions.
 2013-01-20 17:06:47 +01:00
Stephen Kelly d7f1520938 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex. 
It is not necessary and the current state is unintentional. Before
this patch,

 target_link_libraries(foo bar)

causes the LINK_LIBRARIES property of foo to contain

 $<TARGET_NAME:bar>

instead of just

 bar
 2013-01-20 11:25:35 +01:00
Kitware Robot 35fbe4e4bc CMake Nightly Date Stamp 2013-01-20 00:01:25 -05:00
Kitware Robot 5e572619c6 CMake Nightly Date Stamp 2013-01-19 00:01:19 -05:00
Robert Maynard f447db7f10 XCode generator won't infinitely parse compiler flags (bug #13354). 
When parsing the compiler flag list we reduce the search space on
each iteration to be the subset of the string we hadn't searched
before.
 2013-01-18 11:55:50 -05:00
Stephen Kelly d9afacced3 Exit early if we find an inconsistent property. 
Further messages about inconsistency are distracting.
 2013-01-18 16:10:37 +01:00
Kitware Robot c482dd8c97 CMake Nightly Date Stamp 2013-01-18 00:01:03 -05:00
Stephen Kelly 6c8d8afe34 Add the $<TARGET_POLICY> expression 
This new expression allows checking how a policy was set when a target
was created.  That information is only recorded for a subset of policies,
so a whitelist is used.
 2013-01-17 17:20:17 +01:00
Kitware Robot 2b5459cd1a CMake Nightly Date Stamp 2013-01-17 00:01:19 -05:00
Stephen Kelly 1800f702a0 Populate the link information cache before checking dependent properties. 
The dependent properties check can require the link information.
 2013-01-16 22:43:49 +01:00
Stephen Kelly 24dcf0c007 Make sure generator expressions can be used with target_include_directories. 
Handle the case that a generator expression is used before treating
a non-target as an error.
 2013-01-16 22:16:46 +01:00
Kitware Robot c2ab74acb9 CMake Nightly Date Stamp 2013-01-16 00:01:30 -05:00
Brad King 3a7d1ce3ff Merge topic 'test-export-iface-genex' 
1d74ba2 Test evaluation target via export for generator expressions
522bdac Export the INTERFACE_PIC property.
4ee872c Make the BUILD_INTERFACE of export()ed targets work.
1d47cd9 Add a test for the interfaces in targets exported from the build tree.
6c828f9 Move the exported check for file existence.
cfd4f0a Move the exported check for dependencies of targets
d8fe1fc Only generate one check per missing target.
f623d37 Don't write a comment in the export file without the code.
b279f2b Strip consecutive semicolons when preprocessing genex strings.
 2013-01-15 14:43:05 -05:00
Stephen Kelly 522bdac149 Export the INTERFACE_PIC property. 2013-01-15 14:36:22 -05:00
Stephen Kelly 4ee872cb99 Make the BUILD_INTERFACE of export()ed targets work. 
The existing BUILD_INTERFACE code is executed at generate time, which
is too late for export().
 2013-01-15 14:36:22 -05:00
Stephen Kelly 6c828f9126 Move the exported check for file existence. 
Check only once, in the Config.cmake file, instead of once in each
Config-<cfg>.cmake file.
 2013-01-15 14:36:21 -05:00
Stephen Kelly cfd4f0a4f4 Move the exported check for dependencies of targets 
Check only once, in the Config.cmake file, instead of once in each
Config-<cfg>.cmake file.
 2013-01-15 14:36:21 -05:00
Stephen Kelly d8fe1fcd80 Only generate one check per missing target. 2013-01-15 14:36:21 -05:00
Stephen Kelly f623d37a95 Don't write a comment in the export file without the code. 2013-01-15 14:36:21 -05:00
Stephen Kelly b279f2b431 Strip consecutive semicolons when preprocessing genex strings. 2013-01-15 14:36:21 -05:00
Brad King 33d4e0db3f Merge topic 'update-kwsys' 
e2c756f Merge branch 'upstream-kwsys' into update-kwsys
4ba0ac7 KWSys 2013-01-14 (6fa1c99f)
6f57a90 Merge branch 'upstream-kwsys' into update-kwsys
6318834 KWSys 2013-01-10 (608d6b47)
 2013-01-15 14:34:43 -05:00
Brad King 9a7da738f1 Merge topic 'TARGET_DEFINED-genex' 
2bee6f5 Add the TARGET_DEFINED generator expression
 2013-01-15 14:34:38 -05:00
Brad King a269e65de4 Merge topic 'commands-genex-docs' 
7c7b94f Document the use of generator expressions in new commands.
 2013-01-15 14:34:33 -05:00
Brad King 8d91e23565 Merge topic 'tll-allow-genex' 
1da7502 Don't include generator expressions in old-style link handling.
 2013-01-15 14:34:29 -05:00
Brad King 0dce5bc2f2 Merge topic 'compatible-INTERFACE-user-properties' 
7171fd0 Add a way to check INTERFACE user property compatibility.
 2013-01-15 14:34:24 -05:00
Brad King d870867570 Merge topic 'fix-empty-link-line-crash' 
8ff1d47 CMake: Skip empty link.txt lines (#13845)
 2013-01-15 14:34:20 -05:00
Stephen Kelly 7171fd0a90 Add a way to check INTERFACE user property compatibility. 2013-01-15 14:33:45 -05:00
Kitware Robot 3a40a8adf3 CMake Nightly Date Stamp 2013-01-15 00:01:13 -05:00
Yury G. Kudryashov cf3faacad2 Automoc: Fix automoc for OBJECT libraries. 
Before this patch,
add_library(obj OBJECT helper.cpp)
add_executable(tgt $<TARGET_OBJECTS:obj>)
didn't run automoc on helper.cpp.
 2013-01-15 07:43:04 +04:00
Brad King e2c756fcf0 Merge branch 'upstream-kwsys' into update-kwsys 2013-01-14 09:41:52 -05:00
Kitware Robot 36480eaf5c CMake Nightly Date Stamp 2013-01-14 00:01:23 -05:00