diff options
author | David Cole <david.cole@kitware.com> | 2012-08-24 18:23:52 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-24 18:23:52 (GMT) |
commit | 4f7731d814d4228165c70ec9fd6b580e5541ddc6 (patch) | |
tree | e06d56354598d6364c272c000cc5b9ed128d3ad1 | |
parent | 6d4a3053e63e00f0b0d002ddecd81ff489c97355 (diff) | |
parent | ee949d8871ababb7bde5c03b9ac77c4b15b3f786 (diff) | |
download | CMake-4f7731d814d4228165c70ec9fd6b580e5541ddc6.zip CMake-4f7731d814d4228165c70ec9fd6b580e5541ddc6.tar.gz CMake-4f7731d814d4228165c70ec9fd6b580e5541ddc6.tar.bz2 |
Merge topic 'minor-docs-fixes'
ee949d8 Remove duplicate 'of' from docs.
ecc1acb Remove incorrect doc string for link type enum
805f5e5 Fix some typos in the docs.
389d423 Add missing whitespace to docs.
-rw-r--r-- | Source/cmDocumentVariables.cxx | 6 | ||||
-rw-r--r-- | Source/cmTarget.cxx | 2 | ||||
-rw-r--r-- | Source/cmTarget.h | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx index c2197f2..0ee7759 100644 --- a/Source/cmDocumentVariables.cxx +++ b/Source/cmDocumentVariables.cxx @@ -841,9 +841,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm) "Tell cmake to use MFC for an executable or dll.", "This can be set in a CMakeLists.txt file and will " "enable MFC in the application. It should be set " - "to 1 for static the static MFC library, and 2 for " - "the shared MFC library. This is used in visual " - "studio 6 and 7 project files. The CMakeSetup " + "to 1 for the static MFC library, and 2 for " + "the shared MFC library. This is used in Visual " + "Studio 6 and 7 project files. The CMakeSetup " "dialog used MFC and the CMakeLists.txt looks like this:\n" " add_definitions(-D_AFXDLL)\n" " set(CMAKE_MFC_FLAG 2)\n" diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 775662c..48811c8 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -903,7 +903,7 @@ void cmTarget::DefineProperties(cmake *cm) "Build an executable with a WinMain entry point on windows.", "When this property is set to true the executable when linked " "on Windows will be created with a WinMain() entry point instead " - "of of just main()." + "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. " diff --git a/Source/cmTarget.h b/Source/cmTarget.h index a89c5d9..98eaeec 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -158,9 +158,6 @@ public: void AddSources(std::vector<std::string> const& srcs); cmSourceFile* AddSource(const char* src); - /** - * Get the list of the source files used by this target - */ enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED}; //* how we identify a library, by name and type |