[Plplot-cvs] SF.net SVN: plplot:[9970] trunk

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

Revision: 9970
          http://plplot.svn.sourceforge.net/plplot/?rev=9970&view=rev
Author:   airwin
Date:     2009-05-12 16:48:50 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Reorganize CMake build system for installed examples.
plplot_configure.cmake_installed_examples.in keeps track of the CMake
variables that need to be configured for the installed examples build. The
configured form of that file is installed in examples/cmake/modules (as
plplot_configure.cmake).  The export files are also stored in that
directory.  CMakeLists.txt_installed_examples (installed as
examples/CMakeLists.txt) is no longer configured and simply includes
everything in cmake/modules.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt
    trunk/src/CMakeLists.txt

Added Paths:
-----------
    trunk/examples/CMakeLists.txt_installed_examples
    trunk/examples/plplot_configure.cmake_installed_examples.in

Removed Paths:
-------------
    trunk/examples/CMakeLists.txt_installed_examples.in

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2009-05-12 08:29:49 UTC (rev 9969)
+++ trunk/examples/CMakeLists.txt	2009-05-12 16:48:50 UTC (rev 9970)
@@ -261,13 +261,20 @@
   RENAME Makefile
   )
 
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt_installed_examples
+  DESTINATION ${DATA_DIR}/examples
+  RENAME CMakeLists.txt
+  )
+
 configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt_installed_examples.in
-  ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt_installed_examples
+  ${CMAKE_CURRENT_SOURCE_DIR}/plplot_configure.cmake_installed_examples.in
+  ${CMAKE_CURRENT_BINARY_DIR}/plplot_configure.cmake_installed_examples
   @ONLY
   )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeLists.txt_installed_examples
-  DESTINATION ${DATA_DIR}/examples
-  RENAME CMakeLists.txt
+install(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/plplot_configure.cmake_installed_examples
+  DESTINATION ${DATA_DIR}/examples/cmake/modules
+  RENAME plplot_configure.cmake
   )
+

Copied: trunk/examples/CMakeLists.txt_installed_examples (from rev 9968, trunk/examples/CMakeLists.txt_installed_examples.in)
===================================================================
--- trunk/examples/CMakeLists.txt_installed_examples	                        (rev 0)
+++ trunk/examples/CMakeLists.txt_installed_examples	2009-05-12 16:48:50 UTC (rev 9970)
@@ -0,0 +1,32 @@
+# Top-level CMakeLists.txt for installed PLplot examples
+###
+### Process this file with cmake to produce Makefile
+###
+# Copyright (C) 2009 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; version 2 of the License.
+#
+# 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
+
+project(installed_plplot_examples)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
+# Location where PLplot cmake build system first looks for cmake modules.
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
+
+#Configurable items.
+include(plplot_configure)
+
+include(export_plplot)
+add_subdirectory(c)


Property changes on: trunk/examples/CMakeLists.txt_installed_examples
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Deleted: trunk/examples/CMakeLists.txt_installed_examples.in
===================================================================
--- trunk/examples/CMakeLists.txt_installed_examples.in	2009-05-12 08:29:49 UTC (rev 9969)
+++ trunk/examples/CMakeLists.txt_installed_examples.in	2009-05-12 16:48:50 UTC (rev 9970)
@@ -1,33 +0,0 @@
-# Top-level CMakeLists.txt for installed PLplot examples
-###
-### Process this file with cmake to produce Makefile
-###
-# Copyright (C) 2009 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; version 2 of the License.
-#
-# 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
-
-project(installed_plplot_examples)
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.4 FATAL_ERROR)
-# Location where PLplot cmake build system first looks for cmake modules.
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-#Configurable items.
-set(LIB_TAG "@LIB_TAG@")
-set(INCLUDE_DIR @INCLUDE_DIR@)
-
-include(export_plplot)
-add_subdirectory(c)

Added: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in	                        (rev 0)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in	2009-05-12 16:48:50 UTC (rev 9970)
@@ -0,0 +1,4 @@
+# This file used to configure CMake variables that are used to build the
+# installed examples.
+set(LIB_TAG "@LIB_TAG@")
+set(INCLUDE_DIR @INCLUDE_DIR@)


Property changes on: trunk/examples/plplot_configure.cmake_installed_examples.in
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-05-12 08:29:49 UTC (rev 9969)
+++ trunk/src/CMakeLists.txt	2009-05-12 16:48:50 UTC (rev 9970)
@@ -326,7 +326,7 @@
 LIBRARY DESTINATION ${LIB_DIR}
 RUNTIME DESTINATION ${BIN_DIR}
 )
-install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples)
+install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules)
 
 #message("libplplot${LIB_TAG}_LINK_FLAGS = ${libplplot${LIB_TAG}_LINK_FLAGS}")
 


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