[Plplot-cvs] SF.net SVN: plplot:[11370] trunk/examples/python

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

Revision: 11370
          http://plplot.svn.sourceforge.net/plplot/?rev=11370&view=rev
Author:   airwin
Date:     2010-12-13 01:41:21 +0000 (Mon, 13 Dec 2010)

Log Message:
-----------
Configure the location of the PLplot python modules in the build tree
for the Windows case.  This fix allows Python to give good test
results (for the most part) on my MinGW/MSYS/wine test platform.

Modified Paths:
--------------
    trunk/examples/python/CMakeLists.txt
    trunk/examples/python/plplot_python_start.py.cmake

Modified: trunk/examples/python/CMakeLists.txt
===================================================================
--- trunk/examples/python/CMakeLists.txt	2010-12-13 01:22:00 UTC (rev 11369)
+++ trunk/examples/python/CMakeLists.txt	2010-12-13 01:41:21 UTC (rev 11370)
@@ -227,8 +227,13 @@
 
   set(python_location1 ${CMAKE_SOURCE_DIR}/bindings/python)
   set(python_location2 ${CMAKE_BINARY_DIR}/bindings/python)
-  set(python_location3 ${CMAKE_BINARY_DIR}/bindings/qt_gui/pyqt4)
-  set(python_location4 ${CMAKE_BINARY_DIR}/bindings/gnome2/python)
+  if(WIN32 AND NOT CYGWIN)
+    set(python_location3 ${CMAKE_BINARY_DIR}/dll)
+  else(WIN32 AND NOT CYGWIN)
+    set(python_location3)
+  endif(WIN32 AND NOT CYGWIN)
+  set(python_location4 ${CMAKE_BINARY_DIR}/bindings/qt_gui/pyqt4)
+  set(python_location5 ${CMAKE_BINARY_DIR}/bindings/gnome2/python)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py
@@ -239,6 +244,7 @@
   set(python_location2)
   set(python_location3)
   set(python_location4)
+  set(python_location5)
   configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install

Modified: trunk/examples/python/plplot_python_start.py.cmake
===================================================================
--- trunk/examples/python/plplot_python_start.py.cmake	2010-12-13 01:22:00 UTC (rev 11369)
+++ trunk/examples/python/plplot_python_start.py.cmake	2010-12-13 01:41:21 UTC (rev 11370)
@@ -2,10 +2,10 @@
 # depending on how python_location[12] are set.
 # Note, by careful choice of python_location[12] for the build-tree
 # case and the install tree case you can achieve
-# a clear separation between build and install tree with the current CBS 
-# that is not possible with the current ABS system.
+# a clear separation between build and install tree case.
 import sys
 sys.path.insert (0, "@python_location1@")
 sys.path.insert (0, "@python_location2@")
 sys.path.insert (0, "@python_location3@")
 sys.path.insert (0, "@python_location4@")
+sys.path.insert (0, "@python_location5@")


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