diff options
| author | David Cole <david.cole@kitware.com> | 2012-03-06 20:27:44 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-03-06 20:27:44 (GMT) |
| commit | e872b0d2b8af28297ce4d3dfb9f751003e50e65c (patch) | |
| tree | d45e984616a4ad011031ab8e889e52f4f12c6cff /Source/cmTarget.cxx | |
| parent | 663832eb44b11e0e39f387aedf35ceeafe6360d8 (diff) | |
| parent | 761c146a4c02c76adafb233606dfe50157857c87 (diff) | |
| download | CMake-e872b0d2b8af28297ce4d3dfb9f751003e50e65c.zip CMake-e872b0d2b8af28297ce4d3dfb9f751003e50e65c.tar.gz CMake-e872b0d2b8af28297ce4d3dfb9f751003e50e65c.tar.bz2 | |
Merge topic 'win32_executable-and-macosx_bundle-initializers'
761c146 Add default initializers for WIN32_EXECUTABLE and MACOSX_BUNDLE
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index da99eb9..817375e 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -861,7 +861,9 @@ void cmTarget::DefineProperties(cmake *cm) "of of just main()." "This makes it a GUI executable instead of a console application. " "See the CMAKE_MFC_FLAG variable documentation to configure use " - "of MFC for WinMain executables."); + "of MFC for WinMain executables. " + "This property is initialized by the value of the variable " + "CMAKE_WIN32_EXECUTABLE if it is set when a target is created."); cm->DefineProperty ("MACOSX_BUNDLE", cmProperty::TARGET, @@ -871,7 +873,9 @@ void cmTarget::DefineProperties(cmake *cm) "This makes it a GUI executable that can be launched from " "the Finder. " "See the MACOSX_BUNDLE_INFO_PLIST target property for information " - "about creation of the Info.plist file for the application bundle."); + "about creation of the Info.plist file for the application bundle. " + "This property is initialized by the value of the variable " + "CMAKE_MACOSX_BUNDLE if it is set when a target is created."); cm->DefineProperty ("MACOSX_BUNDLE_INFO_PLIST", cmProperty::TARGET, @@ -1224,6 +1228,8 @@ void cmTarget::SetMakefile(cmMakefile* mf) this->SetPropertyDefault("AUTOMOC", 0); this->SetPropertyDefault("AUTOMOC_MOC_OPTIONS", 0); this->SetPropertyDefault("LINK_INTERFACE_LIBRARIES", 0); + this->SetPropertyDefault("WIN32_EXECUTABLE", 0); + this->SetPropertyDefault("MACOSX_BUNDLE", 0); // Collect the set of configuration types. std::vector<std::string> configNames; |