summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'clean-include-dirs-debugging'Brad King2013-01-2310-63/+122
|\ | | | | | | | | | | | | | | 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.
| * Output include directories as LOG messages, not warnings.Stephen Kelly2013-01-212-4/+8
| |
| * Specify the target whose includes are being listed.Stephen Kelly2013-01-212-6/+6
| |
| * Only output includes once after the start of 'generate-time' when debugging.Stephen Kelly2013-01-215-1/+17
| | | | | | | | | | | | 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.
| * Store includes from the same include_directories call together.Stephen Kelly2013-01-216-52/+91
| | | | | | | | | | | | 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.
* | Merge topic 'export-new-style-files'Brad King2013-01-232-72/+72
|\ \ | | | | | | | | | | | | 02d4e53 Generate new-style cmake code during export.
| * | Generate new-style cmake code during export.Stephen Kelly2013-01-202-72/+72
| | | | | | | | | | | | Use empty end*() commands and lowercase commands.
* | | Merge topic 'fix-LINK_LIBRARIES-population'Brad King2013-01-231-2/+3
|\ \ \ | | | | | | | | | | | | | | | | d7f1520 Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.
| * | | Don't wrap all targets in LINK_LIBRARIES in a TARGET_NAME genex.Stephen Kelly2013-01-201-2/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'qt4-autolink-qtmain'Brad King2013-01-2323-4/+284
|\ \ \ | | | | | | | | | | | | | | | | | | | | e3b5eb6 Automatically link to the qtmain library when linking to QtCore. 6c8d8af Add the $<TARGET_POLICY> expression
| * | | Automatically link to the qtmain library when linking to QtCore.Stephen Kelly2013-01-238-6/+122
| | | | | | | | | | | | | | | | | | | | When using QAxServer, ensure that the qtmain library is excluded by reporting an error at CMake time if it is not.
| * | | Add the $<TARGET_POLICY> expressionStephen Kelly2013-01-1716-0/+164
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'fix-COMPATIBLE_INTERFACE-properties'Brad King2013-01-2332-5/+325
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Export the COMPATIBLE_INTERFACE_BOOL content propertiesStephen Kelly2013-01-217-0/+93
| | | | |
| * | | | Clear the link information in ClearLinkMaps.Stephen Kelly2013-01-211-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Make INTERFACE determined properties readable in generator expressions.Stephen Kelly2013-01-2027-1/+218
| | | | | | | | | | | | | | | | | | | | | | | | | The properties are evaluated as link-dependent interface properties when evaluating the generator expressions.
| * | | | Exit early if we find an inconsistent property.Stephen Kelly2013-01-181-0/+3
| |/ / / | | | | | | | | | | | | Further messages about inconsistency are distracting.
| * | | Populate the link information cache before checking dependent properties.Stephen Kelly2013-01-161-4/+4
| | | | | | | | | | | | | | | | The dependent properties check can require the link information.
* | | | Merge topic 'xcode-duplicate-flags-13354'Brad King2013-01-231-5/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f447db7 XCode generator won't infinitely parse compiler flags (bug #13354).
| * | | | XCode generator won't infinitely parse compiler flags (bug #13354).Robert Maynard2013-01-181-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'fix-target_include_directories-genex'Brad King2013-01-232-1/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 24dcf0c Make sure generator expressions can be used with target_include_directories.
| * | | | | Make sure generator expressions can be used with target_include_directories.Stephen Kelly2013-01-162-1/+18
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Handle the case that a generator expression is used before treating a non-target as an error.
* | | | | Merge topic 'vs11-external-include'Brad King2013-01-232-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bc65b74 VS11: Fix VSExternalInclude test
| * | | | | VS11: Fix VSExternalInclude testBrad King2013-01-162-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CMAKE_SUPPRESS_REGENERATION in the Lib1 and Lib2 projects so that their .vcxproj files do not contain references to ZERO_CHECK. Such references do not make sense when using the files in another .sln file. This does not reduce the effectiveness of the test because real projects that use include_external_msproject will have their own .vcxproj files not generated by CMake anyway.
* | | | | Merge topic 'ExternalProject-DEPENDS-target'Brad King2013-01-232-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c0f1af9 ExternalProject: Allow DEPENDS on normal targets (#13849)
| * | | | | ExternalProject: Allow DEPENDS on normal targets (#13849)Brad King2013-01-162-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ExternalProject_Add DEPENDS option adds two types of dependencies. It adds a target-level build order dependency between the external project target and the named targets. It also adds a file-level dependency on the "done" stamp file of the named external project targets. Targets not created by ExternalProject_Add have no such stamp file and no _EP_STAMP_DIR property. Prior to commit d14c0243 (Refactor repeated code into function, 2012-04-26) we unconditionally accepted an empty stamp dir and generated a dependency on a non-existent file. After that commit we generate an error that no stamp dir is set. Skip the file-level dependency when the named dependency is not an external project target in order to allow this use case. Teach the ExternalProject test to cover the case.
* | | | | | Merge topic 'automoc-object'Brad King2013-01-232-4/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e35cac Automoc: add OBJECT library to QtAutomoc test cf3faac Automoc: Fix automoc for OBJECT libraries.
| * | | | | | Automoc: add OBJECT library to QtAutomoc testYury G. Kudryashov2013-01-151-3/+6
| | | | | | |
| * | | | | | Automoc: Fix automoc for OBJECT libraries.Yury G. Kudryashov2013-01-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this patch, add_library(obj OBJECT helper.cpp) add_executable(tgt $<TARGET_OBJECTS:obj>) didn't run automoc on helper.cpp.
* | | | | | | CMake Nightly Date StampKitware Robot2013-01-231-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-01-221-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-01-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-01-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-01-191-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-01-181-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-01-171-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2013-01-161-1/+1
| |/ |/|
* | Merge topic 'test-export-iface-genex'Brad King2013-01-1516-66/+216
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Test evaluation target via export for generator expressionsStephen Kelly2013-01-151-1/+1
| | |
| * | Export the INTERFACE_PIC property.Stephen Kelly2013-01-157-0/+46
| | |
| * | Make the BUILD_INTERFACE of export()ed targets work.Stephen Kelly2013-01-1510-18/+77
| | | | | | | | | | | | | | | The existing BUILD_INTERFACE code is executed at generate time, which is too late for export().
| * | Add a test for the interfaces in targets exported from the build tree.Stephen Kelly2013-01-152-16/+14
| | |
| * | Move the exported check for file existence.Stephen Kelly2013-01-151-2/+2
| | | | | | | | | | | | | | | Check only once, in the Config.cmake file, instead of once in each Config-<cfg>.cmake file.
| * | Move the exported check for dependencies of targetsStephen Kelly2013-01-156-20/+27
| | | | | | | | | | | | | | | Check only once, in the Config.cmake file, instead of once in each Config-<cfg>.cmake file.
| * | Only generate one check per missing target.Stephen Kelly2013-01-151-11/+15
| | |
| * | Don't write a comment in the export file without the code.Stephen Kelly2013-01-151-0/+4
| | |
| * | Strip consecutive semicolons when preprocessing genex strings.Stephen Kelly2013-01-151-2/+34
| | |
* | | Merge topic 'update-kwsys'Brad King2013-01-154-43/+259
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-01-144-37/+129
| |\ \ \
| | * | | KWSys 2013-01-14 (6fa1c99f)KWSys Robot2013-01-144-37/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 6fa1c99f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 608d6b47..6fa1c99f Brad King (1): 84827cc1 Process: Avoid argv[0]==NULL from parsing empty command line Rolf Eike Beer (8): e041cd66 SystemInformation: factor out QueryMemoryBySysconf() ea850fa0 SystemInformation: factor out QueryProcessorBySysconf() 57f06d49 SystemInformation: count processors with sysconf() on Solaris c6057a06 SystemInformation: fix "Multi-character character constant" 5a27bd4f SystemInformation: make IsHyperThreadingSupported() return bool 342c0ad2 SystemInformation: query memory size with sysconf() on Solaris f0b857c1 SystemInformation: cache result of IsHyperThreadingSupported() ab0c2a09 SystemInformation: try using assembler with BorlandC Change-Id: I072371ed35eed892a5ef62a9e9e6cad734e961d9