[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.436 1.437 cmake.cxx 1.442 1.443

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt cmake.cxx 
Log Message:
Enable extra CodeBlocks generator on Cygwin

This generator builds correctly on Cygwin so it should be enabled.
Change based on patch from issue #10122.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.436
retrieving revision 1.437
diff -C 2 -d -r1.436 -r1.437
*** CMakeLists.txt	13 Jan 2010 17:57:38 -0000	1.436
--- CMakeLists.txt	13 Jan 2010 17:58:07 -0000	1.437
***************
*** 168,171 ****
--- 168,173 ----
    cmExportInstallFileGenerator.h
    cmExportInstallFileGenerator.cxx
+   cmExtraCodeBlocksGenerator.cxx
+   cmExtraCodeBlocksGenerator.h
    cmExtraEclipseCDT4Generator.cxx
    cmExtraEclipseCDT4Generator.h
***************
*** 257,264 ****
  ENDIF(UNIX)
  
- IF(NOT CYGWIN)
-   SET(SRCS ${SRCS} cmExtraCodeBlocksGenerator.cxx)
- ENDIF(NOT CYGWIN)
- 
  # XCode only works on apple
  IF(APPLE)
--- 259,262 ----

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.442
retrieving revision 1.443
diff -C 2 -d -r1.442 -r1.443
*** cmake.cxx	28 Dec 2009 18:44:38 -0000	1.442
--- cmake.cxx	13 Jan 2010 17:58:08 -0000	1.443
***************
*** 83,87 ****
  #endif
  
! #if !defined(__CYGWIN__) && !defined(CMAKE_BOOT_MINGW)
  # include "cmExtraCodeBlocksGenerator.h"
  #endif
--- 83,87 ----
  #endif
  
! #if !defined(CMAKE_BOOT_MINGW)
  # include "cmExtraCodeBlocksGenerator.h"
  #endif
***************
*** 1654,1661 ****
  #endif
  
- #if !defined(__CYGWIN__)
    this->AddExtraGenerator(cmExtraCodeBlocksGenerator::GetActualName(),
                            &cmExtraCodeBlocksGenerator::New);
- #endif
  
  #ifdef CMAKE_USE_ECLIPSE
--- 1654,1659 ----