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

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

Revision: 8205
          http://plplot.svn.sourceforge.net/plplot/?rev=8205&view=rev
Author:   airwin
Date:     2008-01-31 14:14:48 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
Move lena.pgm from examples/c to examples.

Modified Paths:
--------------
    trunk/examples/CMakeLists.txt
    trunk/examples/c/CMakeLists.txt
    trunk/test/CMakeLists.txt

Added Paths:
-----------
    trunk/examples/lena.pgm

Removed Paths:
-------------
    trunk/examples/c/lena.pgm

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2008-01-31 21:25:29 UTC (rev 8204)
+++ trunk/examples/CMakeLists.txt	2008-01-31 22:14:48 UTC (rev 8205)
@@ -25,6 +25,30 @@
   set(RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}")
 endif(USE_RPATH)
 
+# Install lena.pgm in installed examples directory so that all implementations
+# of example 20 in the various examples subdirectories can conveniently
+# access this file.
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
+DESTINATION ${DATA_DIR}/examples
+)
+
+# Do the same as above for the build tree for those who want to individually
+# run the various example 20 implementations from the examples subdirectories
+# of the build tree.
+
+if(BUILD_TEST)
+  add_custom_command(
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+  ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
+  ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
+  )
+  add_custom_target(examples_lena_file ALL
+  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
+  )
+endif(BUILD_TEST)
+
 add_subdirectory(c)
 if(ENABLE_cxx)
   add_subdirectory(c++)

Modified: trunk/examples/c/CMakeLists.txt
===================================================================
--- trunk/examples/c/CMakeLists.txt	2008-01-31 21:25:29 UTC (rev 8204)
+++ trunk/examples/c/CMakeLists.txt	2008-01-31 22:14:48 UTC (rev 8205)
@@ -95,27 +95,3 @@
 DESTINATION ${DATA_DIR}/examples/c
 RENAME Makefile
 )
-
-# Install lena.pgm in installed examples directory so that all implementations
-# of example 20 in the various examples subdirectories can conveniently
-# access this file.
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
-DESTINATION ${DATA_DIR}/examples
-)
-
-# Do the same as above for the build tree for those who want to individually
-# run the various example 20 implementations from the examples subdirectories
-# of the build tree.
-
-if(BUILD_TEST)
-  add_custom_command(
-  OUTPUT ${CMAKE_BINARY_DIR}/examples/lena.pgm
-  COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
-  ${CMAKE_BINARY_DIR}/examples/lena.pgm
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lena.pgm
-  )
-  add_custom_target(examples_lena_file ALL
-  DEPENDS ${CMAKE_BINARY_DIR}/examples/lena.pgm
-  )
-endif(BUILD_TEST)

Deleted: trunk/examples/c/lena.pgm
===================================================================
(Binary files differ)

Copied: trunk/examples/lena.pgm (from rev 8203, trunk/examples/c/lena.pgm)
===================================================================
(Binary files differ)

Modified: trunk/test/CMakeLists.txt
===================================================================
--- trunk/test/CMakeLists.txt	2008-01-31 21:25:29 UTC (rev 8204)
+++ trunk/test/CMakeLists.txt	2008-01-31 22:14:48 UTC (rev 8205)
@@ -194,9 +194,9 @@
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
     COMMAND ${CMAKE_COMMAND} -E copy
-    ${CMAKE_SOURCE_DIR}/examples/c/lena.pgm
+    ${CMAKE_SOURCE_DIR}/examples/lena.pgm
     ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm
-    DEPENDS ${CMAKE_SOURCE_DIR}/examples/c/lena.pgm
+    DEPENDS ${CMAKE_SOURCE_DIR}/examples/lena.pgm
   )
   add_custom_target(lena_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lena.pgm)
   if(ENABLE_octave)


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