From: <ai...@us...> - 2008-12-10 01:55:25
|
Revision: 9065 http://plplot.svn.sourceforge.net/plplot/?rev=9065&view=rev Author: airwin Date: 2008-12-10 01:38:06 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Add example 14 scripts to the list of those that should be installed. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-12-10 01:35:07 UTC (rev 9064) +++ trunk/examples/python/CMakeLists.txt 2008-12-10 01:38:06 UTC (rev 9065) @@ -32,6 +32,7 @@ "11" "12" "13" +"14" "15" "16" "17" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-12-10 01:55:55
|
Revision: 9067 http://plplot.svn.sourceforge.net/plplot/?rev=9067&view=rev Author: airwin Date: 2008-12-10 01:55:51 +0000 (Wed, 10 Dec 2008) Log Message: ----------- Improve commentary and deal with examples 14 and 17 properly this time. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2008-12-10 01:49:05 UTC (rev 9066) +++ trunk/examples/python/CMakeLists.txt 2008-12-10 01:55:51 UTC (rev 9067) @@ -18,6 +18,7 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# N.B. examples 14 and 17 handled independently. set(python_STRING_INDICES "01" "02" @@ -32,10 +33,8 @@ "11" "12" "13" -"14" "15" "16" -"17" "18" "19" "20" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-03-20 23:57:24
|
Revision: 9763 http://plplot.svn.sourceforge.net/plplot/?rev=9763&view=rev Author: airwin Date: 2009-03-20 23:57:20 +0000 (Fri, 20 Mar 2009) Log Message: ----------- Install test_circle.py Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-03-20 23:53:25 UTC (rev 9762) +++ trunk/examples/python/CMakeLists.txt 2009-03-20 23:57:20 UTC (rev 9763) @@ -71,6 +71,7 @@ xw17.py xw31.py plplot_logo.py +test_circle.py ) if(ENABLE_pygcw) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-30 23:16:15
|
Revision: 10103 http://plplot.svn.sourceforge.net/plplot/?rev=10103&view=rev Author: airwin Date: 2009-06-30 23:16:12 +0000 (Tue, 30 Jun 2009) Log Message: ----------- Install pytkdemo and its associated examples (currently called x??.py). Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-06-30 19:37:36 UTC (rev 10102) +++ trunk/examples/python/CMakeLists.txt 2009-06-30 23:16:12 UTC (rev 10103) @@ -74,6 +74,31 @@ test_circle.py ) +if(ENABLE_tk) + set(python_SCRIPTS ${python_SCRIPTS} + pytkdemo + x01.py + x02.py + x03.py + x04.py + x05.py + x06.py + x07.py + x08.py + x09.py + x10.py + x11.py + x12.py + x13.py + x14.py + x15.py + x16.py + x17.py + x18.py + x19.py + ) +endif(ENABLE_tk) + if(ENABLE_pyqt4) set( python_SCRIPTS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-08-25 22:23:09
|
Revision: 10338 http://plplot.svn.sourceforge.net/plplot/?rev=10338&view=rev Author: airwin Date: 2009-08-25 22:22:56 +0000 (Tue, 25 Aug 2009) Log Message: ----------- copy_if_different. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-08-25 22:20:47 UTC (rev 10337) +++ trunk/examples/python/CMakeLists.txt 2009-08-25 22:22:56 UTC (rev 10338) @@ -162,9 +162,7 @@ PERMISSIONS ${PERM_DATA} ) -if(BUILD_TEST AND - NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" - ) +if(BUILD_TEST) # equivalent to install commands but at "make" time rather than # "make install" time, to the build tree if different than the source # tree, and skipping plplot_python_start.py since it is already @@ -178,15 +176,15 @@ ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} - COMMAND ${CMAKE_COMMAND} -E copy + COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} ) endforeach(file ${python_SCRIPTS} ${python_DATA}) add_custom_target(python_examples ALL DEPENDS ${command_DEPENDS}) -endif(BUILD_TEST AND - NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" - ) + set_property(GLOBAL PROPERTY TARGETS_examples_python python_examples + _plplotcmodule plplot_widgetmodule) +endif(BUILD_TEST) set(python_location1 ${CMAKE_SOURCE_DIR}/bindings/python) set(python_location2 ${CMAKE_BINARY_DIR}/bindings/python) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-11-10 00:17:04
|
Revision: 10573 http://plplot.svn.sourceforge.net/plplot/?rev=10573&view=rev Author: airwin Date: 2009-11-10 00:16:15 +0000 (Tue, 10 Nov 2009) Log Message: ----------- Add copy_plplotcanvas custom target. Set 4th Python path so that pygcw examples work in the build tree. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-11-10 00:10:22 UTC (rev 10572) +++ trunk/examples/python/CMakeLists.txt 2009-11-10 00:16:15 UTC (rev 10573) @@ -164,6 +164,13 @@ set_property(GLOBAL PROPERTY TARGETS_examples_python python_examples _plplotcmodule plplot_widgetmodule) set_property(GLOBAL PROPERTY FILES_examples_python ${command_DEPENDS}) + if(ENABLE_pygcw) + add_custom_target(copy_plplotcanvas + DEPENDS + ${CMAKE_CURRENT_BINARY_DIR}/plplotcanvas_demo.py + ${CMAKE_CURRENT_BINARY_DIR}/plplotcanvas_animation.py + ) + endif(ENABLE_pygcw) endif(BUILD_TEST) set(PERM_SCRIPTS @@ -194,6 +201,7 @@ 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) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py @@ -203,6 +211,7 @@ set(python_location1 ${PYTHON_INSTDIR}) set(python_location2) set(python_location3) + set(python_location4) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-06-25 18:49:41
|
Revision: 12386 http://sourceforge.net/p/plplot/code/12386 Author: airwin Date: 2013-06-25 18:49:38 +0000 (Tue, 25 Jun 2013) Log Message: ----------- Remove specific install of plplot_py_demos.py from the build tree since that does not work unless BUILD_TEST is ON, and in any case this file is installed already from the source tree as part of python_SCRIPTS. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2013-06-21 19:18:13 UTC (rev 12385) +++ trunk/examples/python/CMakeLists.txt 2013-06-25 18:49:38 UTC (rev 12386) @@ -262,11 +262,6 @@ RENAME plplot_python_start.py ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py - DESTINATION ${DATA_DIR}/examples/python - PERMISSIONS ${PERM_DATA} - ) - install(FILES CMakeLists.txt DESTINATION ${DATA_DIR}/examples/python ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-23 01:18:46
|
Revision: 10063 http://plplot.svn.sourceforge.net/plplot/?rev=10063&view=rev Author: airwin Date: 2009-06-23 00:46:38 +0000 (Tue, 23 Jun 2009) Log Message: ----------- Install pyqt4_test.py Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-06-23 00:46:21 UTC (rev 10062) +++ trunk/examples/python/CMakeLists.txt 2009-06-23 00:46:38 UTC (rev 10063) @@ -72,6 +72,7 @@ xw31.py plplot_logo.py test_circle.py +pyqt4_test.py ) if(ENABLE_pygcw) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-06-28 08:24:37
|
Revision: 10084 http://plplot.svn.sourceforge.net/plplot/?rev=10084&view=rev Author: airwin Date: 2009-06-28 08:23:42 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Indentation fix. Only install pyqt4_test.py if pyqt4 enabled. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-06-28 06:13:08 UTC (rev 10083) +++ trunk/examples/python/CMakeLists.txt 2009-06-28 08:23:42 UTC (rev 10084) @@ -20,35 +20,35 @@ # N.B. examples 14 and 17 handled independently. set(python_STRING_INDICES -"01" -"02" -"03" -"04" -"05" -"06" -"07" -"08" -"09" -"10" -"11" -"12" -"13" -"15" -"16" -"18" -"19" -"20" -"21" -"22" -"23" -"24" -"25" -"26" -"27" -"28" -"29" -"30" -) + "01" + "02" + "03" + "04" + "05" + "06" + "07" + "08" + "09" + "10" + "11" + "12" + "13" + "15" + "16" + "18" + "19" + "20" + "21" + "22" + "23" + "24" + "25" + "26" + "27" + "28" + "29" + "30" + ) set(python_SCRIPTS) set(python_DATA) @@ -60,78 +60,85 @@ # This list contains standalone scripts which are executable and which # should be installed in the examples/python directory. set( -python_SCRIPTS -${python_SCRIPTS} -pythondemos.py -x14 -x17 -x31 -prova.py -xw14.py -xw17.py -xw31.py -plplot_logo.py -test_circle.py -pyqt4_test.py -) + python_SCRIPTS + ${python_SCRIPTS} + pythondemos.py + x14 + x17 + x31 + prova.py + xw14.py + xw17.py + xw31.py + plplot_logo.py + test_circle.py + ) +if(ENABLE_pyqt4) + set( + python_SCRIPTS + ${python_SCRIPTS} + pyqt4_test.py + ) +endif(ENABLE_pyqt4) + if(ENABLE_pygcw) set( - python_SCRIPTS - ${python_SCRIPTS} - plplotcanvas_demo.py - plplotcanvas_animation.py - ) + python_SCRIPTS + ${python_SCRIPTS} + plplotcanvas_demo.py + plplotcanvas_animation.py + ) endif(ENABLE_pygcw) set(PERM_SCRIPTS -OWNER_READ -OWNER_WRITE -OWNER_EXECUTE -GROUP_READ -GROUP_EXECUTE -WORLD_READ -WORLD_EXECUTE -) + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE + ) install(FILES ${python_SCRIPTS} -DESTINATION ${DATA_DIR}/examples/python -PERMISSIONS ${PERM_SCRIPTS} -) + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_SCRIPTS} + ) # This list contains python modules which are not executable on their own and # data files that should be installed in the examples/python directory. set( -python_DATA -${python_DATA} -README.pythondemos -README.logo -svg_760x120_gradient.patch -qplplot.py -) + python_DATA + ${python_DATA} + README.pythondemos + README.logo + svg_760x120_gradient.patch + qplplot.py + ) if(ENABLE_pygcw) set( - python_DATA - ${python_DATA} - README.plplotcanvas - ) + python_DATA + ${python_DATA} + README.plplotcanvas + ) endif(ENABLE_pygcw) set(PERM_DATA -OWNER_READ -OWNER_WRITE -GROUP_READ -WORLD_READ -) + OWNER_READ + OWNER_WRITE + GROUP_READ + WORLD_READ + ) install(FILES ${python_DATA} -DESTINATION ${DATA_DIR}/examples/python -PERMISSIONS ${PERM_DATA} -) + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + ) if(BUILD_TEST AND -NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" -) + NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" + ) # equivalent to install commands but at "make" time rather than # "make install" time, to the build tree if different than the source # tree, and skipping plplot_python_start.py since it is already @@ -139,43 +146,43 @@ set(command_depends) foreach(file ${python_SCRIPTS} ${python_DATA}) set( - command_DEPENDS - ${command_DEPENDS} - ${CMAKE_CURRENT_BINARY_DIR}/${file} - ) + command_DEPENDS + ${command_DEPENDS} + ${CMAKE_CURRENT_BINARY_DIR}/${file} + ) add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} - ) + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) endforeach(file ${python_SCRIPTS} ${python_DATA}) add_custom_target(python_examples ALL DEPENDS ${command_DEPENDS}) endif(BUILD_TEST AND -NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" -) + NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}" + ) set(python_location1 ${CMAKE_SOURCE_DIR}/bindings/python) set(python_location2 ${CMAKE_BINARY_DIR}/bindings/python) configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake -${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py -@ONLY -) + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py + @ONLY + ) set(python_location1 ${PYTHON_INSTDIR}) set(python_location2) configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake -${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install -@ONLY -) + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install + @ONLY + ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install -DESTINATION ${DATA_DIR}/examples/python -PERMISSIONS ${PERM_DATA} -RENAME plplot_python_start.py -) + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + RENAME plplot_python_start.py + ) if (HAVE_NUMPY) configure_file(plplot_py_demos.py.numpy ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py COPYONLY) @@ -184,7 +191,7 @@ endif (HAVE_NUMPY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py -DESTINATION ${DATA_DIR}/examples/python -PERMISSIONS ${PERM_DATA} -) + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-09-18 18:52:24
|
Revision: 10425 http://plplot.svn.sourceforge.net/plplot/?rev=10425&view=rev Author: airwin Date: 2009-09-18 18:52:15 +0000 (Fri, 18 Sep 2009) Log Message: ----------- Generalize CMake logic so it works both for core build of examples and also for installed examples build. Improve file dependency tracking. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2009-09-18 17:34:10 UTC (rev 10424) +++ trunk/examples/python/CMakeLists.txt 2009-09-18 18:52:15 UTC (rev 10425) @@ -18,6 +18,12 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# N.B. This file is used for both the core build (which installs the examples +# and optionally [depending on BUILD_TEST} builds them) and the installed +# examples build. The core build has BUILD_TEST OFF or ON at user option +# and CORE_BUILD always ON. The installed examples build always has +# BUILD_TEST ON and CORE_BUILD OFF. + # N.B. examples 14 and 17 handled independently. set(python_STRING_INDICES "01" @@ -117,20 +123,6 @@ ) endif(ENABLE_pygcw) -set(PERM_SCRIPTS - OWNER_READ - OWNER_WRITE - OWNER_EXECUTE - GROUP_READ - GROUP_EXECUTE - WORLD_READ - WORLD_EXECUTE - ) -install(FILES ${python_SCRIPTS} - DESTINATION ${DATA_DIR}/examples/python - PERMISSIONS ${PERM_SCRIPTS} - ) - # This list contains python modules which are not executable on their own and # data files that should be installed in the examples/python directory. @@ -151,73 +143,98 @@ ) endif(ENABLE_pygcw) -set(PERM_DATA - OWNER_READ - OWNER_WRITE - GROUP_READ - WORLD_READ - ) -install(FILES ${python_DATA} - DESTINATION ${DATA_DIR}/examples/python - PERMISSIONS ${PERM_DATA} - ) +if(CORE_BUILD) -if(BUILD_TEST) - # equivalent to install commands but at "make" time rather than - # "make install" time, to the build tree if different than the source - # tree, and skipping plplot_python_start.py since it is already - # in the build tree. - set(command_depends) - foreach(file ${python_SCRIPTS} ${python_DATA}) - set( - command_DEPENDS - ${command_DEPENDS} - ${CMAKE_CURRENT_BINARY_DIR}/${file} - ) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} - COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} - ) - endforeach(file ${python_SCRIPTS} ${python_DATA}) - add_custom_target(python_examples ALL DEPENDS ${command_DEPENDS}) - set_property(GLOBAL PROPERTY TARGETS_examples_python python_examples - _plplotcmodule plplot_widgetmodule) -endif(BUILD_TEST) + if(BUILD_TEST) + # equivalent to install commands but at "make" time rather than + # "make install" time, to the build tree if different than the source + # tree, and skipping plplot_python_start.py since it is already + # in the build tree. + set(command_depends) + foreach(file ${python_SCRIPTS} ${python_DATA}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + list(APPEND command_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${file}) + endforeach(file ${python_SCRIPTS} ${python_DATA}) + add_custom_target(python_examples ALL DEPENDS ${command_DEPENDS}) + set_property(GLOBAL PROPERTY TARGETS_examples_python python_examples + _plplotcmodule plplot_widgetmodule) + set_property(GLOBAL PROPERTY FILES_examples_python ${command_DEPENDS}) + endif(BUILD_TEST) -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) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake - ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py - @ONLY - ) + set(PERM_SCRIPTS + OWNER_READ + OWNER_WRITE + OWNER_EXECUTE + GROUP_READ + GROUP_EXECUTE + WORLD_READ + WORLD_EXECUTE + ) + install(FILES ${python_SCRIPTS} + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_SCRIPTS} + ) -set(python_location1 ${PYTHON_INSTDIR}) -set(python_location2) -set(python_location3) -configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake - ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install - @ONLY - ) + set(PERM_DATA + OWNER_READ + OWNER_WRITE + GROUP_READ + WORLD_READ + ) + install(FILES ${python_DATA} + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install - DESTINATION ${DATA_DIR}/examples/python - PERMISSIONS ${PERM_DATA} - RENAME plplot_python_start.py - ) + 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) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py + @ONLY + ) -if (HAVE_NUMPY) - configure_file(plplot_py_demos.py.numpy ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py COPYONLY) -else (HAVE_NUMPY) - configure_file(plplot_py_demos.py.numeric ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py COPYONLY) -endif (HAVE_NUMPY) + set(python_location1 ${PYTHON_INSTDIR}) + set(python_location2) + set(python_location3) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake + ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install + @ONLY + ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py - DESTINATION ${DATA_DIR}/examples/python - PERMISSIONS ${PERM_DATA} - ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_python_start.py_install + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + RENAME plplot_python_start.py + ) + if (HAVE_NUMPY) + configure_file(plplot_py_demos.py.numpy ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py COPYONLY) + else (HAVE_NUMPY) + configure_file(plplot_py_demos.py.numeric ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py COPYONLY) + endif (HAVE_NUMPY) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_py_demos.py + DESTINATION ${DATA_DIR}/examples/python + PERMISSIONS ${PERM_DATA} + ) + + install(FILES CMakeLists.txt + DESTINATION ${DATA_DIR}/examples/python + ) + +else(CORE_BUILD) + set_property(GLOBAL PROPERTY FILES_examples_python) + foreach(file ${python_SCRIPTS} ${python_DATA} plplot_python_start.py plplot_py_demos.py) + set_property(GLOBAL APPEND PROPERTY FILES_examples_python + ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + endforeach(file ${python_SCRIPTS} ${python_DATA} plplot_python_start.py plplot_py_demos.py) +endif(CORE_BUILD) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2010-09-24 04:01:51
|
Revision: 11209 http://plplot.svn.sourceforge.net/plplot/?rev=11209&view=rev Author: airwin Date: 2010-09-24 04:01:45 +0000 (Fri, 24 Sep 2010) Log Message: ----------- Properly handle case of vacuous list of plsmem(a) related devices. Modified Paths: -------------- trunk/examples/python/CMakeLists.txt Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2010-09-24 03:30:28 UTC (rev 11208) +++ trunk/examples/python/CMakeLists.txt 2010-09-24 04:01:45 UTC (rev 11209) @@ -189,11 +189,13 @@ if(PLSMEM_DEVICE_LIST) string(REGEX REPLACE ";" "\", \"" PLSMEM_DEVICE_LIST "${PLSMEM_DEVICE_LIST}") set(PLSMEM_DEVICE_LIST "[\"${PLSMEM_DEVICE_LIST}\"]") - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/test_plsmem.py.in - ${CMAKE_CURRENT_BINARY_DIR}/test_plsmem.py - ) + else(PLSMEM_DEVICE_LIST) + set(PLSMEM_DEVICE_LIST "[]") endif(PLSMEM_DEVICE_LIST) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/test_plsmem.py.in + ${CMAKE_CURRENT_BINARY_DIR}/test_plsmem.py + ) set(PERM_SCRIPTS OWNER_READ @@ -204,6 +206,7 @@ WORLD_READ WORLD_EXECUTE ) + install(FILES ${python_SCRIPTS} ${CMAKE_CURRENT_BINARY_DIR}/test_plsmem.py DESTINATION ${DATA_DIR}/examples/python PERMISSIONS ${PERM_SCRIPTS} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |