[Cmake-commits] [cmake-commits] king committed AddCacheEntry.cxx 1.4 1.5 AddCacheEntry.h 1.3 1.4 CMakeLists.txt 1.23 1.24 CMakeSetup.cxx 1.24 1.25 CMakeSetupDialog.cxx 1.63 1.64 CMakeSetupDialog.h 1.31 1.32 QCMake.cxx 1.27 1.28 QCMake.h 1.13 1.14 QCMakeCacheView.cxx 1.43 1.44 QCMakeCacheView.h 1.25 1.26 QCMakeWidgets.cxx 1.2 1.3 QCMakeWidgets.h 1.2 1.3

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Sep 28 11:43:22 EDT 2009


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

Modified Files:
	AddCacheEntry.cxx AddCacheEntry.h CMakeLists.txt 
	CMakeSetup.cxx CMakeSetupDialog.cxx CMakeSetupDialog.h 
	QCMake.cxx QCMake.h QCMakeCacheView.cxx QCMakeCacheView.h 
	QCMakeWidgets.cxx QCMakeWidgets.h 
Log Message:
Convert CMake to OSI-approved BSD License

This converts the CMake license to a pure 3-clause OSI-approved BSD
License.  We drop the previous license clause requiring modified
versions to be plainly marked.  We also update the CMake copyright to
cover the full development time range.


Index: QCMakeWidgets.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeWidgets.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** QCMakeWidgets.cxx	16 Dec 2008 20:15:33 -0000	1.2
--- QCMakeWidgets.cxx	28 Sep 2009 15:43:18 -0000	1.3
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #include "QCMakeWidgets.h"
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #include "QCMakeWidgets.h"

Index: QCMakeWidgets.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeWidgets.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** QCMakeWidgets.h	12 Mar 2009 15:19:27 -0000	1.2
--- QCMakeWidgets.h	28 Sep 2009 15:43:19 -0000	1.3
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #ifndef QCMakeWidgets_h
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #ifndef QCMakeWidgets_h

Index: QCMakeCacheView.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.cxx,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** QCMakeCacheView.cxx	23 Sep 2009 17:09:55 -0000	1.43
--- QCMakeCacheView.cxx	28 Sep 2009 15:43:17 -0000	1.44
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #include "QCMakeCacheView.h"
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #include "QCMakeCacheView.h"

Index: QCMakeCacheView.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMakeCacheView.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C 2 -d -r1.25 -r1.26
*** QCMakeCacheView.h	23 Sep 2009 17:09:56 -0000	1.25
--- QCMakeCacheView.h	28 Sep 2009 15:43:17 -0000	1.26
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #ifndef QCMakeCacheView_h
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #ifndef QCMakeCacheView_h

Index: AddCacheEntry.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/AddCacheEntry.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** AddCacheEntry.cxx	15 May 2008 23:21:01 -0000	1.4
--- AddCacheEntry.cxx	28 Sep 2009 15:43:14 -0000	1.5
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #include "AddCacheEntry.h"
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #include "AddCacheEntry.h"

Index: CMakeSetupDialog.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.cxx,v
retrieving revision 1.63
retrieving revision 1.64
diff -C 2 -d -r1.63 -r1.64
*** CMakeSetupDialog.cxx	23 Sep 2009 17:09:55 -0000	1.63
--- CMakeSetupDialog.cxx	28 Sep 2009 15:43:17 -0000	1.64
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #include "CMakeSetupDialog.h"
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #include "CMakeSetupDialog.h"

Index: CMakeSetupDialog.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** CMakeSetupDialog.h	4 Sep 2009 20:43:07 -0000	1.31
--- CMakeSetupDialog.h	28 Sep 2009 15:43:17 -0000	1.32
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #ifndef CMakeSetupDialog_h
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #ifndef CMakeSetupDialog_h

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** CMakeLists.txt	31 Jul 2009 12:27:36 -0000	1.23
--- CMakeLists.txt	28 Sep 2009 15:43:17 -0000	1.24
***************
*** 1,2 ****
--- 1,13 ----
+ #=============================================================================
+ # CMake - Cross Platform Makefile Generator
+ # Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+ #
+ # This software is distributed WITHOUT ANY WARRANTY; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ # See the License for more information.
+ #=============================================================================
  PROJECT(QtDialog)
  SET(QT_MIN_VERSION "4.3.0")

Index: AddCacheEntry.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/AddCacheEntry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** AddCacheEntry.h	15 May 2008 23:21:01 -0000	1.3
--- AddCacheEntry.h	28 Sep 2009 15:43:16 -0000	1.4
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #ifndef AddCacheEntry_h
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #ifndef AddCacheEntry_h

Index: CMakeSetup.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetup.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeSetup.cxx	22 Sep 2009 22:29:35 -0000	1.24
--- CMakeSetup.cxx	28 Sep 2009 15:43:17 -0000	1.25
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  #include "QCMake.h"  // include to disable MS warnings
  #include <QApplication>
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  #include "QCMake.h"  // include to disable MS warnings
  #include <QApplication>

Index: QCMake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** QCMake.h	12 Mar 2009 15:19:27 -0000	1.13
--- QCMake.h	28 Sep 2009 15:43:17 -0000	1.14
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #ifndef __QCMake_h
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #ifndef __QCMake_h

Index: QCMake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/QCMake.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -C 2 -d -r1.27 -r1.28
*** QCMake.cxx	10 Aug 2009 18:32:08 -0000	1.27
--- QCMake.cxx	28 Sep 2009 15:43:17 -0000	1.28
***************
*** 1,18 ****
! /*=========================================================================
! 
!   Program:   CMake - Cross-Platform Makefile Generator
!   Module:    $RCSfile$
!   Language:  C++
!   Date:      $Date$
!   Version:   $Revision$
! 
!   Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
!   See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
  
!      This software is distributed WITHOUT ANY WARRANTY; without even 
!      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
!      PURPOSE.  See the above copyright notices for more information.
  
! =========================================================================*/
  
  #include "QCMake.h"
--- 1,13 ----
! /*============================================================================
!   CMake - Cross Platform Makefile Generator
!   Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
  
!   Distributed under the OSI-approved BSD License (the "License");
!   see accompanying file Copyright.txt for details.
  
!   This software is distributed WITHOUT ANY WARRANTY; without even the
!   implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
!   See the License for more information.
! ============================================================================*/
  
  #include "QCMake.h"



More information about the Cmake-commits mailing list