[Plplot-cvs] SF.net SVN: plplot:[11340] trunk/CMakeLists.txt

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

Revision: 11340
          http://plplot.svn.sourceforge.net/plplot/?rev=11340&view=rev
Author:   airwin
Date:     2010-11-21 20:41:33 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
Maintain DIST_TARGETS, the list of prebuilt targets to be distributed
with the source tarball.

a. Remove plhershey-unicode.h_built from DIST_TARGETS because that was
   only needed for old windows build at sys/win32/msdev which has been
   removed.

b. Add build_doxygen to DIST_TARGETS.

Maintain the prebuild_dist target which copies files/directories
back to the source tree so they can be distributed with the source
tarball.

a. Remove plhershey-unicode.h file from those being copied since only
   needed for old windows build at sys/win32/msdev which has been
   removed.

b. Do better job of copying octave/plplot_octave_txt directory (i.e.,
   remove directory if it is there in the source tree before copying
   from the build tree.

c. Add doc/doxygen directory to those being copied.

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

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-11-21 20:24:54 UTC (rev 11339)
+++ trunk/CMakeLists.txt	2010-11-21 20:41:33 UTC (rev 11340)
@@ -173,45 +173,50 @@
   # the source tree (if build tree is different from source tree).
 
   # List of targets that must be (pre-)built.
-  # N.B. the plhershey-unicode.h_built target has to be pre-built only because
-  # of the needs of the old windows build at sys/win32/msdev.
-  set(
-    DIST_TARGETS
-    plhershey-unicode.h_built
-    )
+  set(DIST_TARGETS)
 
   if(ENABLE_octave)
-    set(DIST_TARGETS ${DIST_TARGETS} make_documentation)
+    list(APPEND DIST_TARGETS make_documentation)
   endif(ENABLE_octave)
 
   if(BUILD_PRINT)
-    set(DIST_TARGETS ${DIST_TARGETS} print)
+    list(APPEND DIST_TARGETS print)
   endif(BUILD_PRINT)
 
   if(BUILD_INFO)
-    set(DIST_TARGETS ${DIST_TARGETS} info)
+    list(APPEND DIST_TARGETS info)
   endif(BUILD_INFO)
 
   if(BUILD_MAN)
-    set(DIST_TARGETS ${DIST_TARGETS} man)
+    list(APPEND DIST_TARGETS man)
   endif(BUILD_MAN)
 
   if(BUILD_HTML)
-    set(DIST_TARGETS ${DIST_TARGETS} html)
+    list(APPEND DIST_TARGETS html)
   endif(BUILD_HTML)
 
+  if(BUILD_DOX_DOC)
+    list(APPEND DIST_TARGETS build_doxygen)
+  endif(BUILD_DOX_DOC)
+
   if(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
     add_custom_target(prebuild_dist)
   else(CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
     # copy prebuilds back to source tree.
+    # N.B. copy_directory quietly creates an empty directory with no
+    # error condition if the source directory does not exist.
     add_custom_target(
       prebuild_dist
-      COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_BINARY_DIR}/include/plhershey-unicode.h
-      ${CMAKE_SOURCE_DIR}/include
+      COMMAND ${CMAKE_COMMAND} -E remove_directory
+      ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
       COMMAND ${CMAKE_COMMAND} -E copy_directory
       ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
       ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
+      COMMAND ${CMAKE_COMMAND} -E remove_directory
+      ${CMAKE_SOURCE_DIR}/doc/doxygen
+      COMMAND ${CMAKE_COMMAND} -E copy_directory
+      ${CMAKE_BINARY_DIR}/doc/doxygen
+      ${CMAKE_SOURCE_DIR}/doc/doxygen
       COMMAND cp
       `cat static_built_files ${INFO_MANIFEST} ${MAN_MANIFEST} ${HTML_MANIFEST}`
       ${CMAKE_SOURCE_DIR}/doc/docbook/src


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