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

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

Revision: 9985
          http://plplot.svn.sourceforge.net/plplot/?rev=9985&view=rev
Author:   airwin
Date:     2009-05-22 20:28:43 +0000 (Fri, 22 May 2009)

Log Message:
-----------
Implement infrastructure to have a shared version of libplplotdmd, but do
not actually use it since shared library building using gdc seems broken
(at least on Debian Lenny).

Modified Paths:
--------------
    trunk/bindings/d/CMakeLists.txt
    trunk/cmake/modules/plplot_version.cmake

Modified: trunk/bindings/d/CMakeLists.txt
===================================================================
--- trunk/bindings/d/CMakeLists.txt	2009-05-20 03:52:37 UTC (rev 9984)
+++ trunk/bindings/d/CMakeLists.txt	2009-05-22 20:28:43 UTC (rev 9985)
@@ -29,9 +29,40 @@
   set(plplotdmd${LIB_TAG}_LIB_SRCS
     plplot.d
   )
+  # STATIC library the only one that seems to work for now (at least
+  # on Debian Lenny) so use that rather than shared alternative
+  set(plplotdmd_SHARED)
+  if(plplotdm_SHARED)
+    add_library(plplotdmd${LIB_TAG} ${plplotdmd${LIB_TAG}_LIB_SRCS})
 
-  add_library(plplotdmd${LIB_TAG} STATIC ${plplotdmd${LIB_TAG}_LIB_SRCS})
+    if(BUILD_SHARED_LIBS)
+      SET_SOURCE_FILES_PROPERTIES(${plplotdmd${LIB_TAG}_LIB_SRCS}
+	PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
+    endif(BUILD_SHARED_LIBS)
 
+    target_link_libraries(plplotdmd${LIB_TAG} plplot${LIB_TAG})
+
+    if(USE_RPATH)
+      get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+      set_target_properties(plplotdmd${LIB_TAG}
+	PROPERTIES
+	SOVERSION ${plplotdmd_SOVERSION}
+	VERSION ${plplotdmd_VERSION}
+	INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+	INSTALL_NAME_DIR "${LIB_DIR}"
+	)
+    else(USE_RPATH)
+      set_target_properties(plplotdmd${LIB_TAG}
+	PROPERTIES
+	SOVERSION ${plplotdmd_SOVERSION}
+	VERSION ${plplotdmd_VERSION}
+	INSTALL_NAME_DIR "${LIB_DIR}"
+	)
+    endif(USE_RPATH)
+  else(plplotdm_SHARED)
+    add_library(plplotdmd${LIB_TAG} STATIC ${plplotdmd${LIB_TAG}_LIB_SRCS})
+  endif(plplotdm_SHARED)
+
   install(TARGETS plplotdmd${LIB_TAG}
     EXPORT export_plplot
     ARCHIVE DESTINATION ${LIB_DIR}

Modified: trunk/cmake/modules/plplot_version.cmake
===================================================================
--- trunk/cmake/modules/plplot_version.cmake	2009-05-20 03:52:37 UTC (rev 9984)
+++ trunk/cmake/modules/plplot_version.cmake	2009-05-22 20:28:43 UTC (rev 9985)
@@ -45,6 +45,9 @@
 set(plplotcxx_SOVERSION 9)
 set(plplotcxx_VERSION ${plplotcxx_SOVERSION}.3.0)
 
+set(plplotdmd_SOVERSION 0)
+set(plplotdmd_VERSION ${plplotdmd_SOVERSION}.0.0)
+
 set(plplotf77_SOVERSION 9)
 set(plplotf77_VERSION ${plplotf77_SOVERSION}.1.1)
 


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