From: <hba...@us...> - 2010-01-31 23:59:11
|
Revision: 10790 http://plplot.svn.sourceforge.net/plplot/?rev=10790&view=rev Author: hbabcock Date: 2010-01-31 23:59:04 +0000 (Sun, 31 Jan 2010) Log Message: ----------- Windows specific changes to the Python and PyQt4 build: (1) _plplotcmodule.dll is installed as _plplotc.pyd (2) plplot_pyqt4.dll is installed as plplot_pyqt4.pyd On Windows Python versions 2.5+ will only import ".pyd" files and not ".dll" files. Modified Paths: -------------- trunk/bindings/python/CMakeLists.txt trunk/bindings/qt_gui/pyqt4/CMakeLists.txt Modified: trunk/bindings/python/CMakeLists.txt =================================================================== --- trunk/bindings/python/CMakeLists.txt 2010-01-31 20:07:21 UTC (rev 10789) +++ trunk/bindings/python/CMakeLists.txt 2010-01-31 23:59:04 UTC (rev 10790) @@ -88,6 +88,15 @@ ) endif(USE_RPATH) + if(WIN32) + set_target_properties( + _plplotcmodule + PROPERTIES + SUFFIX ".pyd" + OUTPUT_NAME "_plplotc" + ) + endif(WIN32) + add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c) set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "") set_source_files_properties( Modified: trunk/bindings/qt_gui/pyqt4/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/pyqt4/CMakeLists.txt 2010-01-31 20:07:21 UTC (rev 10789) +++ trunk/bindings/qt_gui/pyqt4/CMakeLists.txt 2010-01-31 23:59:04 UTC (rev 10790) @@ -69,7 +69,16 @@ ${plplot_pyqt4_SRC} ) - set_target_properties(plplot_pyqt4 PROPERTIES PREFIX "") + if(WIN32) + set_target_properties( + plplot_pyqt4 + PROPERTIES + PREFIX "" + SUFFIX ".pyd" + ) + else(WIN32) + set_target_properties(plplot_pyqt4 PROPERTIES PREFIX "") + endif(WIN32) target_link_libraries( plplot_pyqt4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |