Menu
▾
▴
plplot-cvs
|
From: <fu...@us...> - 2009-06-30 19:36:36
|
Revision: 10099
http://plplot.svn.sourceforge.net/plplot/?rev=10099&view=rev
Author: furnish
Date: 2009-06-30 19:36:34 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Link the Python widget module against libplplottcltk, so that it can invoke
the Pltk_init function.
Also some comments about linkage reflecting an investigation that needs to be
continued a bit further.
Modified Paths:
--------------
trunk/bindings/python/CMakeLists.txt
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2009-06-30 19:36:18 UTC (rev 10098)
+++ trunk/bindings/python/CMakeLists.txt 2009-06-30 19:36:34 UTC (rev 10099)
@@ -33,9 +33,12 @@
set(python_interface_INCLUDE_PATHS
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/qsastime
+${CMAKE_SOURCE_DIR}/bindings/tcl
+${CMAKE_SOURCE_DIR}/bindings/tk
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
+${TCL_INCLUDE_PATH}
${PYTHON_INCLUDE_PATH}
${CMAKE_SOURCE_DIR}/bindings/swig-support
)
@@ -61,6 +64,9 @@
swig_add_module(plplotcmodule python plplotcmodule.i)
swig_link_libraries(plplotcmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES})
+# FIXME: Previously I found this should be retwritten as:
+#swig_link_libraries(plplotcmodule plplot${LIB_TAG})
+# Investigate before changing.
if(USE_RPATH)
get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
@@ -79,7 +85,15 @@
"-DUSINGDLL"
)
-target_link_libraries(plplot_widgetmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES})
+# FIXME: It remains unclear why PYTHON_LIBRARIES is in this list. This
+# might be system dependent. Doesn't seem to be needed for Linux. Is it
+# really needed for other platforms? Further investigation required.
+target_link_libraries( plplot_widgetmodule
+ plplot${LIB_TAG}
+ plplottcltk${LIB_TAG}
+ ${PYTHON_LIBRARIES}
+ )
+
if(USE_RPATH)
set_target_properties(
plplot_widgetmodule
@@ -112,6 +126,7 @@
)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py
+Plframe.py TclSup.py
DESTINATION ${PYTHON_INSTDIR}
)
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:23:19
|
Revision: 10105
http://plplot.svn.sourceforge.net/plplot/?rev=10105&view=rev
Author: airwin
Date: 2009-06-30 23:23:18 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Indentation fixup.
if Tk not enabled, then drop all Tk-related build components.
Modified Paths:
--------------
trunk/bindings/python/CMakeLists.txt
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2009-06-30 23:17:34 UTC (rev 10104)
+++ trunk/bindings/python/CMakeLists.txt 2009-06-30 23:23:18 UTC (rev 10105)
@@ -20,114 +20,139 @@
if(ENABLE_python)
-# Configure the python scripts to use the correct version of the Numeric library
-if (HAVE_NUMPY)
- configure_file(plplot.py.numpy ${CMAKE_CURRENT_BINARY_DIR}/plplot.py COPYONLY)
-else (HAVE_NUMPY)
- configure_file(plplot.py.Numeric ${CMAKE_CURRENT_BINARY_DIR}/plplot.py COPYONLY)
-endif (HAVE_NUMPY)
+ # Configure the python scripts to use the correct version of the Numeric library
+ if (HAVE_NUMPY)
+ configure_file(plplot.py.numpy ${CMAKE_CURRENT_BINARY_DIR}/plplot.py COPYONLY)
+ else (HAVE_NUMPY)
+ configure_file(plplot.py.Numeric ${CMAKE_CURRENT_BINARY_DIR}/plplot.py COPYONLY)
+ endif (HAVE_NUMPY)
-# This is currently the include list for swig, the C wrapper and the
-# the Python headers. Not particular pretty...
-set(python_interface_INCLUDE_PATHS
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/lib/qsastime
-${CMAKE_SOURCE_DIR}/bindings/tcl
-${CMAKE_SOURCE_DIR}/bindings/tk
-${CMAKE_BINARY_DIR}
-${CMAKE_BINARY_DIR}/include
-${CMAKE_CURRENT_BINARY_DIR}
-${TCL_INCLUDE_PATH}
-${PYTHON_INCLUDE_PATH}
-${CMAKE_SOURCE_DIR}/bindings/swig-support
-)
-include_directories(${python_interface_INCLUDE_PATHS})
+ # This is currently the include list for swig, the C wrapper and the
+ # the Python headers. Not particular pretty...
+ if(ENABLE_tk)
+ set(python_interface_INCLUDE_PATHS
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/lib/qsastime
+ ${CMAKE_SOURCE_DIR}/bindings/tcl
+ ${CMAKE_SOURCE_DIR}/bindings/tk
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${PYTHON_INCLUDE_PATH}
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support
+ )
+ else(ENABLE_tk)
+ set(python_interface_INCLUDE_PATHS
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/lib/qsastime
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${PYTHON_INCLUDE_PATH}
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support
+ )
+ endif(ENABLE_tk)
+ include_directories(${python_interface_INCLUDE_PATHS})
-if(PL_DOUBLE)
- set(CMAKE_SWIG_FLAGS -DPL_DOUBLE_INTERFACE -DSWIG_PYTHON)
-else(PL_DOUBLE)
- set(CMAKE_SWIG_FLAGS -DSWIG_PYTHON)
-endif(PL_DOUBLE)
+ if(PL_DOUBLE)
+ set(CMAKE_SWIG_FLAGS -DPL_DOUBLE_INTERFACE -DSWIG_PYTHON)
+ else(PL_DOUBLE)
+ set(CMAKE_SWIG_FLAGS -DSWIG_PYTHON)
+ endif(PL_DOUBLE)
-set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
+ set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
-set(SWIG_MODULE_plplotcmodule_EXTRA_DEPS
-${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i)
+ set(SWIG_MODULE_plplotcmodule_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i)
-set_source_files_properties(plplotcmodule.i
-PROPERTIES SWIG_MODULE_NAME plplotc
-)
+ set_source_files_properties(plplotcmodule.i
+ PROPERTIES SWIG_MODULE_NAME plplotc
+ )
-# Set up swig + c wrapper.
-# N.B. the python target has an underscore prepended automatically.
-swig_add_module(plplotcmodule python plplotcmodule.i)
+ # Set up swig + c wrapper.
+ # N.B. the python target has an underscore prepended automatically.
+ swig_add_module(plplotcmodule python plplotcmodule.i)
-swig_link_libraries(plplotcmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES})
-# FIXME: Previously I found this should be retwritten as:
-#swig_link_libraries(plplotcmodule plplot${LIB_TAG})
-# Investigate before changing.
+ swig_link_libraries(plplotcmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES})
+ # FIXME: Previously I found this should be retwritten as:
+ #swig_link_libraries(plplotcmodule plplot${LIB_TAG})
+ # Investigate before changing.
-if(USE_RPATH)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- set_target_properties(
- _plplotcmodule
- PROPERTIES
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- )
-endif(USE_RPATH)
+ if(USE_RPATH)
+ get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+ set_target_properties(
+ _plplotcmodule
+ PROPERTIES
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ )
+ endif(USE_RPATH)
-add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c)
-set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "")
-set_source_files_properties(
- plplot_widgetmodule.c
- PROPERTIES COMPILE_FLAGS
- "-DUSINGDLL"
-)
-
-# FIXME: It remains unclear why PYTHON_LIBRARIES is in this list. This
-# might be system dependent. Doesn't seem to be needed for Linux. Is it
-# really needed for other platforms? Further investigation required.
-target_link_libraries( plplot_widgetmodule
- plplot${LIB_TAG}
- plplottcltk${LIB_TAG}
- ${PYTHON_LIBRARIES}
+ add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c)
+ set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "")
+ set_source_files_properties(
+ plplot_widgetmodule.c
+ PROPERTIES COMPILE_FLAGS
+ "-DUSINGDLL"
)
-if(USE_RPATH)
- set_target_properties(
- plplot_widgetmodule
- PROPERTIES
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${PYTHON_INSTDIR}"
- )
-else(USE_RPATH)
- set_target_properties(
- plplot_widgetmodule
- PROPERTIES
- INSTALL_NAME_DIR "${PYTHON_INSTDIR}"
- )
-endif(USE_RPATH)
+ # FIXME: It remains unclear why PYTHON_LIBRARIES is in this list. This
+ # might be system dependent. Doesn't seem to be needed for Linux. Is it
+ # really needed for other platforms? Further investigation required.
+ if(ENABLE_tk)
+ target_link_libraries( plplot_widgetmodule
+ plplot${LIB_TAG}
+ plplottcltk${LIB_TAG}
+ ${PYTHON_LIBRARIES}
+ )
+ else(ENABLE_tk)
+ target_link_libraries( plplot_widgetmodule
+ plplot${LIB_TAG}
+ ${PYTHON_LIBRARIES}
+ )
+ endif(ENABLE_tk)
-install(
-TARGETS plplot_widgetmodule _plplotcmodule
-LIBRARY
-DESTINATION ${PYTHON_INSTDIR}
-)
+ if(USE_RPATH)
+ set_target_properties(
+ plplot_widgetmodule
+ PROPERTIES
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${PYTHON_INSTDIR}"
+ )
+ else(USE_RPATH)
+ set_target_properties(
+ plplot_widgetmodule
+ PROPERTIES
+ INSTALL_NAME_DIR "${PYTHON_INSTDIR}"
+ )
+ endif(USE_RPATH)
-set(PERM_SCRIPTS
-OWNER_READ
-OWNER_WRITE
-OWNER_EXECUTE
-GROUP_READ
-GROUP_EXECUTE
-WORLD_READ
-WORLD_EXECUTE
-)
-install(
-FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py
-Plframe.py TclSup.py
-DESTINATION ${PYTHON_INSTDIR}
-)
+ install(
+ TARGETS plplot_widgetmodule _plplotcmodule
+ LIBRARY
+ DESTINATION ${PYTHON_INSTDIR}
+ )
+ set(PERM_SCRIPTS
+ OWNER_READ
+ OWNER_WRITE
+ OWNER_EXECUTE
+ GROUP_READ
+ GROUP_EXECUTE
+ WORLD_READ
+ WORLD_EXECUTE
+ )
+ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py
+ DESTINATION ${PYTHON_INSTDIR}
+ )
+ if(ENABLE_tk)
+ install(
+ FILES
+ Plframe.py TclSup.py
+ DESTINATION ${PYTHON_INSTDIR}
+ )
+ endif(ENABLE_tk)
+
endif(ENABLE_python)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-09-18 17:34:24
|
Revision: 10424
http://plplot.svn.sourceforge.net/plplot/?rev=10424&view=rev
Author: airwin
Date: 2009-09-18 17:34:10 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
Remove FIXME comments since there is now an EXCLUDE_PYTHON_LIBRARIES option
the user can set to ON if they prefer not to link in the python libraries
for some reason.
Modified Paths:
--------------
trunk/bindings/python/CMakeLists.txt
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2009-09-18 17:27:21 UTC (rev 10423)
+++ trunk/bindings/python/CMakeLists.txt 2009-09-18 17:34:10 UTC (rev 10424)
@@ -76,9 +76,6 @@
swig_add_module(plplotcmodule python plplotcmodule.i)
swig_link_libraries(plplotcmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES})
- # FIXME: Previously I found this should be retwritten as:
- #swig_link_libraries(plplotcmodule plplot${LIB_TAG})
- # Investigate before changing.
if(USE_RPATH)
get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
@@ -97,9 +94,6 @@
"-DUSINGDLL"
)
- # FIXME: It remains unclear why PYTHON_LIBRARIES is in this list. This
- # might be system dependent. Doesn't seem to be needed for Linux. Is it
- # really needed for other platforms? Further investigation required.
if(ENABLE_tk)
target_link_libraries( plplot_widgetmodule
plplot${LIB_TAG}
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:07:11
|
Revision: 10569
http://plplot.svn.sourceforge.net/plplot/?rev=10569&view=rev
Author: airwin
Date: 2009-11-10 00:06:52 +0000 (Tue, 10 Nov 2009)
Log Message:
-----------
EXPORT plplot_widgetmodule and _plplotcmodule to make those targets available
for installed examples build.
Modified Paths:
--------------
trunk/bindings/python/CMakeLists.txt
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2009-11-10 00:05:09 UTC (rev 10568)
+++ trunk/bindings/python/CMakeLists.txt 2009-11-10 00:06:52 UTC (rev 10569)
@@ -123,7 +123,8 @@
endif(USE_RPATH)
install(
- TARGETS plplot_widgetmodule _plplotcmodule
+ TARGETS plplot_widgetmodule _plplotcmodule
+ EXPORT export_plplot
LIBRARY
DESTINATION ${PYTHON_INSTDIR}
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <arj...@us...> - 2013-07-19 12:41:06
|
Revision: 12432
http://sourceforge.net/p/plplot/code/12432
Author: arjenmarkus
Date: 2013-07-19 12:41:03 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Change the logic for defining the _plplotc module, because Cygwin requires an extension .dll
Modified Paths:
--------------
trunk/bindings/python/CMakeLists.txt
Modified: trunk/bindings/python/CMakeLists.txt
===================================================================
--- trunk/bindings/python/CMakeLists.txt 2013-07-19 09:53:51 UTC (rev 12431)
+++ trunk/bindings/python/CMakeLists.txt 2013-07-19 12:41:03 UTC (rev 12432)
@@ -86,14 +86,21 @@
)
endif(USE_RPATH)
- if(WIN32_OR_CYGWIN)
+ if(WIN32_AND_NOT_CYGWIN)
set_target_properties(
_plplotcmodule
PROPERTIES
SUFFIX ".pyd"
OUTPUT_NAME "_plplotc"
)
- endif(WIN32_OR_CYGWIN)
+ elseif(CYGWIN)
+ set_target_properties(
+ _plplotcmodule
+ PROPERTIES
+ SUFFIX ".dll"
+ OUTPUT_NAME "_plplotc"
+ )
+ endif(WIN32_AND_NOT_CYGWIN)
add_library(plplot_widgetmodule MODULE plplot_widgetmodule.c)
set_target_properties(plplot_widgetmodule PROPERTIES PREFIX "")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X