[Plplot-cvs] SF.net SVN: plplot:[9801] trunk/bindings

[<sm...@us...>]

Revision: 9801
          http://plplot.svn.sourceforge.net/plplot/?rev=9801&view=rev
Author:   smekal
Date:     2009-04-15 06:54:10 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Revert changes regarding creation of import libraries for DLLs since this issue was solved with the addition of the files Windows-GNU-Fortran.cmake and Cygwin-GNU-Fortran.cmake in cmake/Modules/Platform/.

Modified Paths:
--------------
    trunk/bindings/f77/CMakeLists.txt
    trunk/bindings/f95/CMakeLists.txt

Modified: trunk/bindings/f77/CMakeLists.txt
===================================================================
--- trunk/bindings/f77/CMakeLists.txt	2009-04-13 18:37:50 UTC (rev 9800)
+++ trunk/bindings/f77/CMakeLists.txt	2009-04-15 06:54:10 UTC (rev 9801)
@@ -130,23 +130,8 @@
 configurable.f
 )
 
-if(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW)
-  set(plplotf77${LIB_TAG}_LIB_SRCS ${plplotf77${LIB_TAG}_LIB_SRCS} plplotf77.def)
-endif(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW)
-
 add_library(plplotf77${LIB_TAG} ${plplotf77${LIB_TAG}_LIB_SRCS})
 
-if(MINGW AND BUILD_SHARED_LIBS)
-  add_custom_command(
-    TARGET plplotf77${LIB_TAG}
-    POST_BUILD
-    COMMAND dlltool libplplotf77${LIB_TAG}.dll -d ${CMAKE_CURRENT_SOURCE_DIR}/plplotf77_mingw.def -l libplplotf77${LIB_TAG}.dll.a
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dll 
-    COMMENT "Creating library file: libplplotf77${LIB_TAG}.dll.a"
-  )
-endif(MINGW AND BUILD_SHARED_LIBS)
-
-
 target_link_libraries(plplotf77${LIB_TAG}  plplotf77c${LIB_TAG})
 
 if(USE_RPATH)

Modified: trunk/bindings/f95/CMakeLists.txt
===================================================================
--- trunk/bindings/f95/CMakeLists.txt	2009-04-13 18:37:50 UTC (rev 9800)
+++ trunk/bindings/f95/CMakeLists.txt	2009-04-15 06:54:10 UTC (rev 9801)
@@ -116,26 +116,12 @@
     sfstubs.h
     )
 
-  if(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW)
-    SET(plplotf95${LIB_TAG}_LIB_SRCS ${plplotf95${LIB_TAG}_LIB_SRCS} plplotf95.def)
-  endif(WIN32 AND BUILD_SHARED_LIBS AND NOT MINGW)
-
   # Explicitly include dependencies for sfstubsf95.f90
   include(AddFileDependencies)
   add_file_dependencies(sfstubsf95.f90 ${CMAKE_CURRENT_BINARY_DIR}/plflt.inc)
 
   add_library(plplotf95${LIB_TAG} ${plplotf95${LIB_TAG}_LIB_SRCS})
 
-  if(MINGW AND BUILD_SHARED_LIBS)
-    add_custom_command(
-      TARGET plplotf95${LIB_TAG}
-      POST_BUILD
-      COMMAND dlltool libplplotf95${LIB_TAG}.dll -d ${CMAKE_CURRENT_SOURCE_DIR}/plplotf95_mingw.def -l libplplotf95${LIB_TAG}.dll.a
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/dll 
-      COMMENT "Creating library file: libplplotf95${LIB_TAG}.dll.a"
-    )
-  endif(MINGW AND BUILD_SHARED_LIBS)
-
   target_link_libraries(plplotf95${LIB_TAG}  plplotf95c${LIB_TAG})
 
   if(USE_RPATH)


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