[Cmake-commits] [cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.13 1.14 CMakeLists.txt 1.157 1.158

[cmake-commits at cmake.org]

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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.157
retrieving revision 1.158
diff -C 2 -d -r1.157 -r1.158
*** CMakeLists.txt	31 Jul 2009 12:27:34 -0000	1.157
--- CMakeLists.txt	3 Sep 2009 21:01:05 -0000	1.158
***************
*** 77,128 ****
  
  
- #-----------------------------------------------------------------------
- # a macro to check for MFC and setup to build the MFC Dialog
- # simply to improve readability of the main script
- #-----------------------------------------------------------------------
- MACRO(CMAKE_TEST_FOR_MFC)
-   SET(CMAKE_BUILD_ON_VISUAL_STUDIO 0)
-   IF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
-     SET(CMAKE_BUILD_ON_VISUAL_STUDIO 1)
-   ENDIF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
-   
-   IF(CMAKE_BUILD_ON_VISUAL_STUDIO)
-     IF("CMake_HAVE_MFC" MATCHES "^CMake_HAVE_MFC$")
-       SET(CHECK_INCLUDE_FILE_VAR "afxwin.h")
-       CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in
-         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx)
-       MESSAGE(STATUS "Looking for MFC")
-       TRY_COMPILE(CMake_HAVE_MFC
-         ${CMAKE_BINARY_DIR}
-         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckIncludeFile.cxx
-         CMAKE_FLAGS
-         -DCMAKE_MFC_FLAG:STRING=2
-         -DCOMPILE_DEFINITIONS:STRING=-D_AFXDLL
-         OUTPUT_VARIABLE OUTPUT)
-       IF(CMake_HAVE_MFC)
-         MESSAGE(STATUS "Looking for MFC - found")
-         SET(CMake_HAVE_MFC 1 CACHE INTERNAL "Have MFC?")
-         FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-           "Determining if MFC exists passed with the following output:\n"
-           "${OUTPUT}\n\n")
-       ELSE(CMake_HAVE_MFC)
-         MESSAGE(STATUS "Looking for MFC - not found")
-         SET(CMake_HAVE_MFC 0 CACHE INTERNAL "Have MFC?")
-         FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
-           "Determining if MFC exists failed with the following output:\n"
-           "${OUTPUT}\n\n")
-       ENDIF(CMake_HAVE_MFC)
-     ENDIF("CMake_HAVE_MFC" MATCHES "^CMake_HAVE_MFC$")
-     
-     IF(CMake_HAVE_MFC)
-       OPTION(BUILD_MFCDialog "Whether to build the CMakeSetup MFC dialog." ON)
-     ELSE(CMake_HAVE_MFC)
-       SET(BUILD_MFCDialog 0)
-     ENDIF(CMake_HAVE_MFC)
-   ELSE(CMAKE_BUILD_ON_VISUAL_STUDIO)
-     SET(BUILD_MFCDialog 0)
-   ENDIF(CMAKE_BUILD_ON_VISUAL_STUDIO)
- ENDMACRO(CMAKE_TEST_FOR_MFC)
  
  
  
--- 77,85 ----
  
  
  
+ SET(CMAKE_BUILD_ON_VISUAL_STUDIO 0)
+ IF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
+   SET(CMAKE_BUILD_ON_VISUAL_STUDIO 1)
+ ENDIF(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
  
  
***************
*** 448,454 ****
  
  
- # should we build the MFC dialog? (a macro defined in this file)
- CMAKE_TEST_FOR_MFC()
- 
  # add the uninstall support
  CONFIGURE_FILE(
--- 405,408 ----

Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** CMakeCPackOptions.cmake.in	20 Jul 2009 16:08:34 -0000	1.13
--- CMakeCPackOptions.cmake.in	3 Sep 2009 21:01:05 -0000	1.14
***************
*** 19,30 ****
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
-     "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cpack.html" "CPack Help"
      "http://www.cmake.org" "CMake Web Site"
      )
-   # tell cpack the executables you want in the start menu as links
-   SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMakeSetup(deprecated)" )
-   # tell cpack to create a desktop link to CMakeSetup
-   SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe")
    SET(CPACK_NSIS_DISPLAY_NAME "CMake @CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR@ a cross-platform, open-source build system")
    SET(CPACK_NSIS_PACKAGE_NAME "CMake @CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR@")
--- 19,25 ----