kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
David Cole 2012-08-24 14:23:52 -04:00 committed by CMake Topic Stage
parent 6d4a3053e6 ee949d8871
commit 4f7731d814
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmDocumentVariables.cxx
View File

@ -841,9 +841,9 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
"Tell cmake to use MFC for an executable or dll.", "Tell cmake to use MFC for an executable or dll.",
"This can be set in a CMakeLists.txt file and will " "This can be set in a CMakeLists.txt file and will "
"enable MFC in the application. It should be set " "enable MFC in the application. It should be set "
"to 1 for static the static MFC library, and 2 for " "to 1 for the static MFC library, and 2 for "
"the shared MFC library. This is used in visual " "the shared MFC library. This is used in Visual "
"studio 6 and 7 project files. The CMakeSetup " "Studio 6 and 7 project files. The CMakeSetup "
"dialog used MFC and the CMakeLists.txt looks like this:\n" "dialog used MFC and the CMakeLists.txt looks like this:\n"
" add_definitions(-D_AFXDLL)\n" " add_definitions(-D_AFXDLL)\n"
" set(CMAKE_MFC_FLAG 2)\n" " set(CMAKE_MFC_FLAG 2)\n"

2
Source/cmTarget.cxx
View File

@ -903,7 +903,7 @@ void cmTarget::DefineProperties(cmake *cm)
"Build an executable with a WinMain entry point on windows.", "Build an executable with a WinMain entry point on windows.",
"When this property is set to true the executable when linked " "When this property is set to true the executable when linked "
"on Windows will be created with a WinMain() entry point instead " "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. " "This makes it a GUI executable instead of a console application. "
"See the CMAKE_MFC_FLAG variable documentation to configure use " "See the CMAKE_MFC_FLAG variable documentation to configure use "
"of MFC for WinMain executables. " "of MFC for WinMain executables. "

3
Source/cmTarget.h
View File

@ -158,9 +158,6 @@ public:
void AddSources(std::vector<std::string> const& srcs); void AddSources(std::vector<std::string> const& srcs);
cmSourceFile* AddSource(const char* src); cmSourceFile* AddSource(const char* src);
/**
* Get the list of the source files used by this target
*/
enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED}; enum LinkLibraryType {GENERAL, DEBUG, OPTIMIZED};
//* how we identify a library, by name and type //* how we identify a library, by name and type