[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.425 1.426 cmDocumentVariables.cxx 1.41 1.42 cmake.cxx 1.423 1.424

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv25462/Source

Modified Files:
	CMakeLists.txt cmDocumentVariables.cxx cmake.cxx 
Log Message:
Remove CMakeSetup. Long live cmake-gui, start building Qt now.


Index: cmDocumentVariables.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmDocumentVariables.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -C 2 -d -r1.41 -r1.42
*** cmDocumentVariables.cxx	3 Sep 2009 19:29:29 -0000	1.41
--- cmDocumentVariables.cxx	3 Sep 2009 21:01:05 -0000	1.42
***************
*** 177,184 ****
    cm->DefineProperty
      ("CMAKE_EDIT_COMMAND", cmProperty::VARIABLE,
!      "Full path to CMakeSetup or ccmake.",
       "This is the full path to the CMake executable "
       "that can graphically edit the cache.  For example,"
!      " CMakeSetup, ccmake, or cmake -i.",false,
       "Variables that Provide Information");
  
--- 177,184 ----
    cm->DefineProperty
      ("CMAKE_EDIT_COMMAND", cmProperty::VARIABLE,
!      "Full path to cmake-gui or ccmake.",
       "This is the full path to the CMake executable "
       "that can graphically edit the cache.  For example,"
!      " cmake-gui, ccmake, or cmake -i.",false,
       "Variables that Provide Information");
  
***************
*** 290,294 ****
       "This is the top level source directory for the project. "
       "It corresponds to the source directory given to "
!      "CMakeSetup or ccmake.",false,
       "Variables that Provide Information");
    cm->DefineProperty
--- 290,294 ----
       "This is the top level source directory for the project. "
       "It corresponds to the source directory given to "
!      "cmake-gui or ccmake.",false,
       "Variables that Provide Information");
    cm->DefineProperty
***************
*** 632,636 ****
       "the shared MFC library.  This is used in visual "
       "studio 6 and 7 project files.   The CMakeSetup "
!      "dialog uses MFC and the CMakeLists.txt looks like this:\n"
       "add_definitions(-D_AFXDLL)\n"
       "set(CMAKE_MFC_FLAG 2)\n"
--- 632,636 ----
       "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"

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.425
retrieving revision 1.426
diff -C 2 -d -r1.425 -r1.426
*** CMakeLists.txt	19 Aug 2009 12:58:24 -0000	1.425
--- CMakeLists.txt	3 Sep 2009 21:01:05 -0000	1.426
***************
*** 470,479 ****
  ENDIF(BUILD_CursesDialog)
  
- # MFC GUI
- # MFC libraries are only available on Visual Studio
- IF(BUILD_MFCDialog)
-   SUBDIRS(MFCDialog)
- ENDIF(BUILD_MFCDialog)
- 
  # Qt GUI
  OPTION(BUILD_QtDialog "Build Qt dialog for CMake" FALSE)
--- 470,473 ----

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.423
retrieving revision 1.424
diff -C 2 -d -r1.423 -r1.424
*** cmake.cxx	1 Sep 2009 19:08:50 -0000	1.423
--- cmake.cxx	3 Sep 2009 21:01:05 -0000	1.424
***************
*** 841,845 ****
        {
        editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
!         "/CMakeSetup" + cmSystemTools::GetFilenameExtension(cMakeSelf);
        }
      if(cmSystemTools::FileExists(editCacheCommand.c_str()))
--- 841,845 ----
        {
        editCacheCommand = cmSystemTools::GetFilenamePath(cMakeSelf) +
!         "/cmake-gui" + cmSystemTools::GetFilenameExtension(cMakeSelf);
        }
      if(cmSystemTools::FileExists(editCacheCommand.c_str()))