From: <sm...@us...> - 2009-03-19 20:59:19
|
Revision: 9760 http://plplot.svn.sourceforge.net/plplot/?rev=9760&view=rev Author: smekal Date: 2009-03-19 20:58:58 +0000 (Thu, 19 Mar 2009) Log Message: ----------- CMake does not produce an import library of the libplplotf77d.dll dynamic library for the MinGW g77 Fortran compiler even if the definition file is added to the target. I have found not other way then to add a custom post-build target which produces the import library using the MinGW dlltool. Fortran examples link now. Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2009-03-19 20:51:57 UTC (rev 9759) +++ trunk/bindings/f77/CMakeLists.txt 2009-03-19 20:58:58 UTC (rev 9760) @@ -130,12 +130,23 @@ configurable.f ) -if(WIN32 AND BUILD_SHARED_LIBS) - SET(plplotf77${LIB_TAG}_LIB_SRCS ${plplotf77${LIB_TAG}_LIB_SRCS} plplotf77.def) -endif(WIN32 AND BUILD_SHARED_LIBS) +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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-04-29 04:44:54
|
Revision: 9863 http://plplot.svn.sourceforge.net/plplot/?rev=9863&view=rev Author: arjenmarkus Date: 2009-04-29 04:44:51 +0000 (Wed, 29 Apr 2009) Log Message: ----------- Restored settings for .def file, for the bare Windows case Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2009-04-28 18:53:04 UTC (rev 9862) +++ trunk/bindings/f77/CMakeLists.txt 2009-04-29 04:44:51 UTC (rev 9863) @@ -130,6 +130,10 @@ configurable.f ) +if(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW) + SET(plplotf77${LIB_TAG}_LIB_SRCS ${plplotf77${LIB_TAG}_LIB_SRCS} plplotf77.def) +endif(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW) + add_library(plplotf77${LIB_TAG} ${plplotf77${LIB_TAG}_LIB_SRCS}) target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <arj...@us...> - 2009-05-08 04:28:23
|
Revision: 9938 http://plplot.svn.sourceforge.net/plplot/?rev=9938&view=rev Author: arjenmarkus Date: 2009-05-08 04:28:21 +0000 (Fri, 08 May 2009) Log Message: ----------- Create a separate library to handle command-line arguments, if needed Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2009-05-08 04:27:00 UTC (rev 9937) +++ trunk/bindings/f77/CMakeLists.txt 2009-05-08 04:28:21 UTC (rev 9938) @@ -124,19 +124,37 @@ ) ## Build fortran part of F77 bindings -set(plplotf77${LIB_TAG}_LIB_SRCS -strutil.f -sfstubs.f -configurable.f -) +if(STATIC_OPTS) + # Put the file configurable.f in a separate static library + set(plplotf77opts${LIB_TAG}_LIB_SRCS + configurable.f + ) + set(plplotf77${LIB_TAG}_LIB_SRCS + strutil.f + sfstubs.f + ) +else(STATIC_OPTS) + set(plplotf77${LIB_TAG}_LIB_SRCS + strutil.f + sfstubs.f + configurable.f + ) +endif(STATIC_OPTS) + if(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW) SET(plplotf77${LIB_TAG}_LIB_SRCS ${plplotf77${LIB_TAG}_LIB_SRCS} plplotf77.def) endif(WIN32 AND BUILD_SHARED_LIBS AND NOT CYGWIN AND NOT MINGW) add_library(plplotf77${LIB_TAG} ${plplotf77${LIB_TAG}_LIB_SRCS}) -target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG}) +if(STATIC_OPTS) + add_library(plplotf77opts${LIB_TAG} STATIC ${plplotf77opts${LIB_TAG}_LIB_SRCS}) + target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG}) + target_link_libraries(plplotf77opts${LIB_TAG} plplotf77${LIB_TAG} plplotf77c${LIB_TAG}) +else(STATIC_OPTS) + target_link_libraries(plplotf77${LIB_TAG} plplotf77c${LIB_TAG}) +endif(STATIC_OPTS) if(USE_RPATH) set_target_properties(plplotf77${LIB_TAG} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-01-29 17:32:08
|
Revision: 11529 http://plplot.svn.sourceforge.net/plplot/?rev=11529&view=rev Author: airwin Date: 2011-01-29 17:32:02 +0000 (Sat, 29 Jan 2011) Log Message: ----------- Drop commentary about possible file dependency bug that was not actually there! Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2011-01-29 17:13:27 UTC (rev 11528) +++ trunk/bindings/f77/CMakeLists.txt 2011-01-29 17:32:02 UTC (rev 11529) @@ -69,19 +69,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h ) -# I have found that there is no way to get the proper file dependency -# between the generated -# ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h and examples/f77/x??f -# builds. For example, if you change plplot_parameters.fm4, -# plplot_parameters.h gets rebuilt, BUT x??f does not! This possible -# CMake bug has been brought up on the cmake mailing list just now -# (2011-01-28) so a fix may be in the future. GENERATED makes no -# diffence to this issue so comment that out below. -# set_source_files_properties( -# ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h -# PROPERTIES GENERATED ON -# ) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-12 19:09:13
|
Revision: 10401 http://plplot.svn.sourceforge.net/plplot/?rev=10401&view=rev Author: airwin Date: 2009-09-12 19:09:05 +0000 (Sat, 12 Sep 2009) Log Message: ----------- Remove PROPERTIES GENERATED from configurable.f. That is inappropriate because that file is generated at cmake time, not generated at run time. Add PROPERTIES GENERATED to sfstubs.f since that file _is_ generated at run time. This apparently solves a small latency issue (f77 bindings were being rebuilt unnecessarily). Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2009-09-12 18:49:53 UTC (rev 10400) +++ trunk/bindings/f77/CMakeLists.txt 2009-09-12 19:09:05 UTC (rev 10401) @@ -27,7 +27,7 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sfstubs.f COMMAND ${CMAKE_COMMAND} - -E copy ${CMAKE_CURRENT_SOURCE_DIR}/sfstubs.fm4 ${CMAKE_CURRENT_BINARY_DIR}/sfstubs.f + -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/sfstubs.fm4 ${CMAKE_CURRENT_BINARY_DIR}/sfstubs.f DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sfstubs.fm4 ) else(PL_DOUBLE) @@ -40,6 +40,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/sfstubs.fm4 ) endif(PL_DOUBLE) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/sfstubs.f + PROPERTIES GENERATED ON) if(WIN32) # Set the flags for the C compiler. The C stubs need to have the @@ -61,8 +63,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/configurable.f.cmake ${CMAKE_CURRENT_BINARY_DIR}/configurable.f ) - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/configurable.f - PROPERTIES GENERATED ON) # Set the include path include_directories( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2011-02-12 18:08:07
|
Revision: 11557 http://plplot.svn.sourceforge.net/plplot/?rev=11557&view=rev Author: airwin Date: 2011-02-12 18:08:01 +0000 (Sat, 12 Feb 2011) Log Message: ----------- Tweak commentary and run-time messages. Modified Paths: -------------- trunk/bindings/f77/CMakeLists.txt Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2011-02-10 20:09:47 UTC (rev 11556) +++ trunk/bindings/f77/CMakeLists.txt 2011-02-12 18:08:01 UTC (rev 11557) @@ -112,8 +112,7 @@ ## Build C part of F77 bindings - # Add (Unix) custom target to check that f77 version of - # plplot_parameters.fm4 is up to date. + # Check consistency of plplot_parameters.fm4. add_custom_target( check_f77_parameters COMMAND ${CMAKE_COMMAND} -E remove -f @@ -123,7 +122,7 @@ ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i > ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.fm4_compare COMMAND - ${CMAKE_COMMAND} -E echo Check that f77 version of plplot_parameters.fm4 is up to date. + ${CMAKE_COMMAND} -E echo "Check that plplot_parameters.fm4 is consistent with the #defines in bindings/swig-support/plplotcapi.i" COMMAND cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_parameters.fm4 ${CMAKE_CURRENT_BINARY_DIR}/plplot_parameters.fm4_compare This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |