[Plplot-cvs] SF.net SVN: plplot:[12408] trunk/include

[<ai...@us...>]

Revision: 12408
          http://sourceforge.net/p/plplot/code/12408
Author:   airwin
Date:     2013-07-09 16:28:26 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
Move from *.cmake form to *.in form for configurable files.

Modified Paths:
--------------
    trunk/include/CMakeLists.txt

Added Paths:
-----------
    trunk/include/plConfig.h.in
    trunk/include/plDevs.h.in

Removed Paths:
-------------
    trunk/include/plConfig.h.cmake
    trunk/include/plDevs.h.cmake

Modified: trunk/include/CMakeLists.txt
===================================================================
--- trunk/include/CMakeLists.txt	2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/CMakeLists.txt	2013-07-09 16:28:26 UTC (rev 12408)
@@ -20,12 +20,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
 
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/plConfig.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/plConfig.h
   )
 
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/plDevs.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/plDevs.h
   )
 

Deleted: trunk/include/plConfig.h.cmake
===================================================================
--- trunk/include/plConfig.h.cmake	2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plConfig.h.cmake	2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,109 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-//  Maurice LeBrun
-//  IFS, University of Texas at Austin
-//  18-Jul-1994
-//
-//  Copyright (C) 2004, 2006, 2007, 2008, 2009  Alan W. Irwin
-//  Copyright (C) 2004  Rafael Laboissiere
-//  Copyright (C) 2004  Joao Cardoso
-//
-//  This file is part of PLplot.
-//
-//  PLplot is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU Library General Public License as published
-//  by the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  PLplot is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU Library General Public License for more details.
-//
-//  You should have received a copy of the GNU Library General Public License
-//  along with PLplot; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-// Configured (by CMake) macros for PLplot that are required for the
-// core build and the build of the installed
-// examples (and presumably any user applications).  Therefore, the
-// configured plConfig.h should be installed.  In contrast,
-// config.h.cmake (note, plConfig.h #includes config.h for
-// the core build because HAVE_CONFIG_H is #defined in that case)
-// contains configured macros that are only required for the core
-// build.  Therefore, in contrast to plConfig.h, config.h should not
-// be installed.
-//
-// Maintenance issue: in makes no sense to configure duplicate macros
-// for both config.h and plConfig.h.  Therefore, when adding a macro
-// decide which file to put it in depending on whether the result is
-// needed for the installed examples build or not.  Furthermore, move
-// configured macros from one file to the other as needed depending on
-// that criterion, but do not copy them.
-//
-//
-
-#ifndef __PLCONFIG_H__
-#define __PLCONFIG_H__
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-// Define if you have c++ accessible stdint.h
-#cmakedefine PL_HAVE_CXX_STDINT_H
-
-// Define if snprintf is available
-#ifndef PL_HAVE_SNPRINTF
-#cmakedefine PL_HAVE_SNPRINTF
-#endif
-
-// Define if _snprintf is available
-#ifndef _PL_HAVE_SNPRINTF
-#cmakedefine _PL_HAVE_SNPRINTF
-#endif
-
-// Define if isfinite is available
-#cmakedefine PL_HAVE_ISFINITE
-
-// Define if finite is available
-#cmakedefine PL_HAVE_FINITE
-
-// Define if _finite is available
-#cmakedefine PL__HAVE_FINITE
-
-// Define if isinf is available
-#cmakedefine PL_HAVE_ISINF
-
-// Define if _isinf is available
-#cmakedefine PL__HAVE_ISINF
-
-// Define if isnan is available
-#cmakedefine PL_HAVE_ISNAN
-
-// Define if _isnan is available
-#cmakedefine PL__HAVE_ISNAN
-
-// Define to 1 if you have the <stdint.h> header file.
-#cmakedefine PL_HAVE_STDINT_H 1
-
-// Define to 1 if you have the <unistd.h> header file.
-#cmakedefine PL_HAVE_UNISTD_H 1
-
-// Define if usleep is available
-#cmakedefine PL_HAVE_USLEEP
-
-// Define if you want PLplot's float type to be double
-#cmakedefine PL_DOUBLE
-
-// Define if C++ compiler accepts using namespace
-#cmakedefine PL_USE_NAMESPACE
-
-// Define if isnan is present in <math.h> but not in <cmath>
-// - broken Mac OSX systems
-#cmakedefine PL_BROKEN_ISNAN_CXX
-
-#endif  // __PLCONFIG_H__

Copied: trunk/include/plConfig.h.in (from rev 12396, trunk/include/plConfig.h.cmake)
===================================================================
--- trunk/include/plConfig.h.in	                        (rev 0)
+++ trunk/include/plConfig.h.in	2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,109 @@
+// -*-C-*-
+// $Id$
+//
+//  Maurice LeBrun
+//  IFS, University of Texas at Austin
+//  18-Jul-1994
+//
+//  Copyright (C) 2004, 2006, 2007, 2008, 2009  Alan W. Irwin
+//  Copyright (C) 2004  Rafael Laboissiere
+//  Copyright (C) 2004  Joao Cardoso
+//
+//  This file is part of PLplot.
+//
+//  PLplot is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Library General Public License as published
+//  by the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  PLplot is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Library General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public License
+//  along with PLplot; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
+
+// Configured (by CMake) macros for PLplot that are required for the
+// core build and the build of the installed
+// examples (and presumably any user applications).  Therefore, the
+// configured plConfig.h should be installed.  In contrast,
+// config.h.cmake (note, plConfig.h #includes config.h for
+// the core build because HAVE_CONFIG_H is #defined in that case)
+// contains configured macros that are only required for the core
+// build.  Therefore, in contrast to plConfig.h, config.h should not
+// be installed.
+//
+// Maintenance issue: in makes no sense to configure duplicate macros
+// for both config.h and plConfig.h.  Therefore, when adding a macro
+// decide which file to put it in depending on whether the result is
+// needed for the installed examples build or not.  Furthermore, move
+// configured macros from one file to the other as needed depending on
+// that criterion, but do not copy them.
+//
+//
+
+#ifndef __PLCONFIG_H__
+#define __PLCONFIG_H__
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+// Define if you have c++ accessible stdint.h
+#cmakedefine PL_HAVE_CXX_STDINT_H
+
+// Define if snprintf is available
+#ifndef PL_HAVE_SNPRINTF
+#cmakedefine PL_HAVE_SNPRINTF
+#endif
+
+// Define if _snprintf is available
+#ifndef _PL_HAVE_SNPRINTF
+#cmakedefine _PL_HAVE_SNPRINTF
+#endif
+
+// Define if isfinite is available
+#cmakedefine PL_HAVE_ISFINITE
+
+// Define if finite is available
+#cmakedefine PL_HAVE_FINITE
+
+// Define if _finite is available
+#cmakedefine PL__HAVE_FINITE
+
+// Define if isinf is available
+#cmakedefine PL_HAVE_ISINF
+
+// Define if _isinf is available
+#cmakedefine PL__HAVE_ISINF
+
+// Define if isnan is available
+#cmakedefine PL_HAVE_ISNAN
+
+// Define if _isnan is available
+#cmakedefine PL__HAVE_ISNAN
+
+// Define to 1 if you have the <stdint.h> header file.
+#cmakedefine PL_HAVE_STDINT_H 1
+
+// Define to 1 if you have the <unistd.h> header file.
+#cmakedefine PL_HAVE_UNISTD_H 1
+
+// Define if usleep is available
+#cmakedefine PL_HAVE_USLEEP
+
+// Define if you want PLplot's float type to be double
+#cmakedefine PL_DOUBLE
+
+// Define if C++ compiler accepts using namespace
+#cmakedefine PL_USE_NAMESPACE
+
+// Define if isnan is present in <math.h> but not in <cmath>
+// - broken Mac OSX systems
+#cmakedefine PL_BROKEN_ISNAN_CXX
+
+#endif  // __PLCONFIG_H__

Deleted: trunk/include/plDevs.h.cmake
===================================================================
--- trunk/include/plDevs.h.cmake	2013-07-09 06:03:41 UTC (rev 12407)
+++ trunk/include/plDevs.h.cmake	2013-07-09 16:28:26 UTC (rev 12408)
@@ -1,102 +0,0 @@
-// -*-C-*-
-// $Id$
-//
-//  Maurice LeBrun
-//  IFS, University of Texas at Austin
-//  18-Jul-1994
-//
-//  Contains macro definitions that determine what device drivers are
-//  compiled into the PLplot library.  On a Unix system, typically the
-//  configure script builds plDevs.h from plDevs.h.in.  Elsewhere, it's
-//  best to hand-configure a plDevs.h file and keep it with the
-//  system-specific files.
-//
-//  Copyright (C) 2004  Andrew Roach
-//  Copyright (C) 2005  Thomas J. Duck
-//  Copyright (C) 2006  Andrew Ross
-//  Copyright (C) 2006  Alan W. Irwin
-//
-//  This file is part of PLplot.
-//
-//  PLplot is free software; you can redistribute it and/or modify
-//  it under the terms of the GNU Library General Public License as published
-//  by the Free Software Foundation; either version 2 of the License, or
-//  (at your option) any later version.
-//
-//  PLplot is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU Library General Public License for more details.
-//
-//  You should have received a copy of the GNU Library General Public License
-//  along with PLplot; if not, write to the Free Software
-//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-
-#ifndef __PLDEVS_H__
-#define __PLDEVS_H__
-
-#cmakedefine PDL_aqt
-#cmakedefine PLD_plmeta
-#cmakedefine PLD_null
-#cmakedefine PLD_xterm
-#cmakedefine PLD_tek4010
-#cmakedefine PLD_tek4010f
-#cmakedefine PLD_tek4107
-#cmakedefine PLD_tek4107f
-#cmakedefine PLD_mskermit
-#cmakedefine PLD_vlt
-#cmakedefine PLD_versaterm
-#cmakedefine PLD_conex
-#cmakedefine PLD_linuxvga
-#cmakedefine PLD_dg300
-#cmakedefine PLD_png
-#cmakedefine PLD_jpeg
-#cmakedefine PLD_gif
-#cmakedefine PLD_cgm
-#cmakedefine PLD_ps
-#cmakedefine PLD_xfig
-#cmakedefine PLD_ljiip
-#cmakedefine PLD_ljii
-#cmakedefine PLD_lj_hpgl
-#cmakedefine PLD_hp7470
-#cmakedefine PLD_hp7580
-#cmakedefine PLD_imp
-#cmakedefine PLD_xwin
-#cmakedefine PLD_tk
-#cmakedefine PLD_pbm
-#cmakedefine PLD_gcw
-#cmakedefine PLD_gnome
-#cmakedefine PLD_pstex
-#cmakedefine PLD_psttf
-#cmakedefine PLD_ntk
-#cmakedefine PLD_tkwin
-#cmakedefine PLD_mem
-#cmakedefine PLD_wingcc
-#cmakedefine PLD_wxwidgets
-#cmakedefine PLD_wxpng
-#cmakedefine PLD_svg
-#cmakedefine PLD_pdf
-#cmakedefine PLD_xcairo
-#cmakedefine PLD_pdfcairo
-#cmakedefine PLD_pscairo
-#cmakedefine PLD_epscairo
-#cmakedefine PLD_svgcairo
-#cmakedefine PLD_pngcairo
-#cmakedefine PLD_memcairo
-#cmakedefine PLD_extcairo
-#cmakedefine PLD_wincairo
-#cmakedefine PLD_bmpqt
-#cmakedefine PLD_jpgqt
-#cmakedefine PLD_pngqt
-#cmakedefine PLD_ppmqt
-#cmakedefine PLD_tiffqt
-#cmakedefine PLD_svgqt
-#cmakedefine PLD_epsqt
-#cmakedefine PLD_pdfqt
-#cmakedefine PLD_qtwidget
-#cmakedefine PLD_extqt
-#cmakedefine PLD_memqt
-
-#endif  // __PLDEVS_H__

Copied: trunk/include/plDevs.h.in (from rev 12396, trunk/include/plDevs.h.cmake)
===================================================================
--- trunk/include/plDevs.h.in	                        (rev 0)
+++ trunk/include/plDevs.h.in	2013-07-09 16:28:26 UTC (rev 12408)
@@ -0,0 +1,102 @@
+// -*-C-*-
+// $Id$
+//
+//  Maurice LeBrun
+//  IFS, University of Texas at Austin
+//  18-Jul-1994
+//
+//  Contains macro definitions that determine what device drivers are
+//  compiled into the PLplot library.  On a Unix system, typically the
+//  configure script builds plDevs.h from plDevs.h.in.  Elsewhere, it's
+//  best to hand-configure a plDevs.h file and keep it with the
+//  system-specific files.
+//
+//  Copyright (C) 2004  Andrew Roach
+//  Copyright (C) 2005  Thomas J. Duck
+//  Copyright (C) 2006  Andrew Ross
+//  Copyright (C) 2006  Alan W. Irwin
+//
+//  This file is part of PLplot.
+//
+//  PLplot is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU Library General Public License as published
+//  by the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  PLplot is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU Library General Public License for more details.
+//
+//  You should have received a copy of the GNU Library General Public License
+//  along with PLplot; if not, write to the Free Software
+//  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+//
+//
+
+#ifndef __PLDEVS_H__
+#define __PLDEVS_H__
+
+#cmakedefine PDL_aqt
+#cmakedefine PLD_plmeta
+#cmakedefine PLD_null
+#cmakedefine PLD_xterm
+#cmakedefine PLD_tek4010
+#cmakedefine PLD_tek4010f
+#cmakedefine PLD_tek4107
+#cmakedefine PLD_tek4107f
+#cmakedefine PLD_mskermit
+#cmakedefine PLD_vlt
+#cmakedefine PLD_versaterm
+#cmakedefine PLD_conex
+#cmakedefine PLD_linuxvga
+#cmakedefine PLD_dg300
+#cmakedefine PLD_png
+#cmakedefine PLD_jpeg
+#cmakedefine PLD_gif
+#cmakedefine PLD_cgm
+#cmakedefine PLD_ps
+#cmakedefine PLD_xfig
+#cmakedefine PLD_ljiip
+#cmakedefine PLD_ljii
+#cmakedefine PLD_lj_hpgl
+#cmakedefine PLD_hp7470
+#cmakedefine PLD_hp7580
+#cmakedefine PLD_imp
+#cmakedefine PLD_xwin
+#cmakedefine PLD_tk
+#cmakedefine PLD_pbm
+#cmakedefine PLD_gcw
+#cmakedefine PLD_gnome
+#cmakedefine PLD_pstex
+#cmakedefine PLD_psttf
+#cmakedefine PLD_ntk
+#cmakedefine PLD_tkwin
+#cmakedefine PLD_mem
+#cmakedefine PLD_wingcc
+#cmakedefine PLD_wxwidgets
+#cmakedefine PLD_wxpng
+#cmakedefine PLD_svg
+#cmakedefine PLD_pdf
+#cmakedefine PLD_xcairo
+#cmakedefine PLD_pdfcairo
+#cmakedefine PLD_pscairo
+#cmakedefine PLD_epscairo
+#cmakedefine PLD_svgcairo
+#cmakedefine PLD_pngcairo
+#cmakedefine PLD_memcairo
+#cmakedefine PLD_extcairo
+#cmakedefine PLD_wincairo
+#cmakedefine PLD_bmpqt
+#cmakedefine PLD_jpgqt
+#cmakedefine PLD_pngqt
+#cmakedefine PLD_ppmqt
+#cmakedefine PLD_tiffqt
+#cmakedefine PLD_svgqt
+#cmakedefine PLD_epsqt
+#cmakedefine PLD_pdfqt
+#cmakedefine PLD_qtwidget
+#cmakedefine PLD_extqt
+#cmakedefine PLD_memqt
+
+#endif  // __PLDEVS_H__

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.