← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/cmake/jaunty-security

« back to all changes in this revision

Viewing changes to Source/MFCDialog/CMakeSetup.cpp

  • Committer: Bazaar Package Importer
  • Author(s): A. Maitland Bottoms
  • Date: 2006-06-18 16:34:11 UTC
  • mfrom: (1.4.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20060618163411-pi234s3v6jwlcmof
Tags: 2.4.2-1
http://bugs.debian.org/338324
http://bugs.debian.org/366663
http://bugs.debian.org/366664
* New upstream release (Closes: #338324)
* Put cmake .vim files into /usr/share/vim/addons/plugin/
  where they can be used. (Closes: #366663)
* Install cmake-mode.el so it can be used. (Closes: #366664)
* Ensure cmake FindKDE locates KDE libraries on Debian
  based distributions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/MFCDialog/CMakeSetup.cpp
94
94
  //  the specific initialization routines you do not need.
95
95
#if _MFC_VER <= 0x421
96
96
#ifdef _AFXDLL
97
 
  Enable3dControls();                   // Call this when using MFC in a shared DLL
 
97
  Enable3dControls();                   // Call this when using MFC in a shared DLL
98
98
#else
99
 
  Enable3dControlsStatic();     // Call this when linking to MFC statically
 
99
  Enable3dControlsStatic();     // Call this when linking to MFC statically
100
100
#endif
101
101
#endif
102
102
  CMakeCommandLineInfo cmdInfo;
103
103
  ParseCommandLine(cmdInfo);
104
 
  
105
 
  // Check for documentation options.
 
104
 
 
105
  // Check for documentation options.  If there are no arguments skip
 
106
  // the check because the GUI should be displayed instead of showing
 
107
  // usage in this case.
106
108
  cmDocumentation doc;
107
 
  if(doc.CheckOptions(cmdInfo.GetArgC(), cmdInfo.GetArgV()))
 
109
  if(cmdInfo.GetArgC() > 1 &&
 
110
     doc.CheckOptions(cmdInfo.GetArgC(), cmdInfo.GetArgV()))
108
111
    {
109
112
    // Construct and print requested documentation.
110
113
    cmake hcm;