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

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

Revision: 9973
          http://plplot.svn.sourceforge.net/plplot/?rev=9973&view=rev
Author:   airwin
Date:     2009-05-12 19:09:15 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Add D examples to CMake-based build system for installed examples.

Modified Paths:
--------------
    trunk/bindings/d/CMakeLists.txt
    trunk/examples/CMakeLists.txt
    trunk/examples/d/CMakeLists.txt
    trunk/examples/plplot_configure.cmake_installed_examples.in

Added Paths:
-----------
    trunk/examples/d/CMakeLists.txt_installed_examples_d

Modified: trunk/bindings/d/CMakeLists.txt
===================================================================
--- trunk/bindings/d/CMakeLists.txt	2009-05-12 18:38:50 UTC (rev 9972)
+++ trunk/bindings/d/CMakeLists.txt	2009-05-12 19:09:15 UTC (rev 9973)
@@ -33,8 +33,14 @@
   add_library(plplotdmd${LIB_TAG} STATIC ${plplotdmd${LIB_TAG}_LIB_SRCS})
 
   install(TARGETS plplotdmd${LIB_TAG}
+    EXPORT export_plplot
     ARCHIVE DESTINATION ${LIB_DIR}
     LIBRARY DESTINATION ${LIB_DIR}
     RUNTIME DESTINATION ${BIN_DIR}
   )
+  install(EXPORT export_plplot
+    DESTINATION ${DATA_DIR}/examples/cmake/modules
+    FILE export_plplotd.cmake
+    )
+
 endif(ENABLE_d)

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2009-05-12 18:38:50 UTC (rev 9972)
+++ trunk/examples/CMakeLists.txt	2009-05-12 19:09:15 UTC (rev 9973)
@@ -278,3 +278,25 @@
   RENAME plplot_configure.cmake
   )
 
+# Install PLplot-specific language support files needed for CMake-based
+# build of installed examples.
+
+set(LANG_SUPPORT_FILES
+  CMakeD_Copyright.txt
+  CMakeDCompiler.cmake.in
+  CMakeDInformation.cmake
+  CMakeDetermineDCompiler.cmake
+  CMakeTestDCompiler.cmake
+
+  CMakeAdaCompiler.cmake.in
+  CMakeAdaInformation.cmake
+  CMakeDetermineAdaCompiler.cmake
+  CMakeTestAdaCompiler.cmake
+  )
+
+foreach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES})
+  install(FILES
+    ${CMAKE_SOURCE_DIR}/cmake/modules/${LANG_SUPPORT_FILE}
+    DESTINATION ${DATA_DIR}/examples/cmake/modules
+    )
+endforeach(LANG_SUPPORT_FILE ${LANG_SUPPORT_FILES})

Modified: trunk/examples/d/CMakeLists.txt
===================================================================
--- trunk/examples/d/CMakeLists.txt	2009-05-12 18:38:50 UTC (rev 9972)
+++ trunk/examples/d/CMakeLists.txt	2009-05-12 19:09:15 UTC (rev 9973)
@@ -71,3 +71,9 @@
   DESTINATION ${DATA_DIR}/examples/d
   RENAME Makefile
 )
+
+install(FILES CMakeLists.txt_installed_examples_d
+  DESTINATION ${DATA_DIR}/examples/d
+  RENAME CMakeLists.txt
+  )
+

Added: trunk/examples/d/CMakeLists.txt_installed_examples_d
===================================================================
--- trunk/examples/d/CMakeLists.txt_installed_examples_d	                        (rev 0)
+++ trunk/examples/d/CMakeLists.txt_installed_examples_d	2009-05-12 19:09:15 UTC (rev 9973)
@@ -0,0 +1,47 @@
+# d/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
+
+set(d_STRING_INDICES
+"02"
+"03"
+"04"
+"05"
+"06"
+"07"
+"08"
+"10"
+"11"
+"12"
+"13"
+"17"
+"23"
+"24"
+"25"
+"27"
+"29"
+"30"
+)
+
+include_directories(${INCLUDE_DIR})
+foreach(STRING_INDEX ${d_STRING_INDICES})
+  set(d_SRCS ${d_SRCS} x${STRING_INDEX}d.d)
+  add_executable(x${STRING_INDEX}d x${STRING_INDEX}d.d)
+  target_link_libraries(x${STRING_INDEX}d plplotdmd${LIB_TAG} plplot${LIB_TAG} ${MATH_LIB})
+endforeach(STRING_INDEX ${d_STRING_INDICES})


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

Modified: trunk/examples/plplot_configure.cmake_installed_examples.in
===================================================================
--- trunk/examples/plplot_configure.cmake_installed_examples.in	2009-05-12 18:38:50 UTC (rev 9972)
+++ trunk/examples/plplot_configure.cmake_installed_examples.in	2009-05-12 19:09:15 UTC (rev 9973)
@@ -12,4 +12,7 @@
 if(ENABLE_f95)
   set(F95_MOD_DIR @F95_MOD_DIR@)
 endif(ENABLE_f95)
-#set(ENABLE_d @ENABLE_d@)
+set(ENABLE_d @ENABLE_d@)
+if(ENABLE_d)
+  enable_language(D)
+endif(ENABLE_d)


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