From: <and...@us...> - 2010-01-20 23:01:52
|
Revision: 10762 http://plplot.svn.sourceforge.net/plplot/?rev=10762&view=rev Author: andrewross Date: 2010-01-20 23:01:42 +0000 (Wed, 20 Jan 2010) Log Message: ----------- Update debian support for 5.9.5 release. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/patches/02_unset-python-path.diff branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.diff branches/v5_9_5_debian/debian/patches/series branches/v5_9_5_debian/debian/rules Added Paths: ----------- branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff Property Changed: ---------------- branches/v5_9_5_debian/debian/ Property changes on: branches/v5_9_5_debian/debian ___________________________________________________________________ Added: svn:mergeinfo + /trunk/debian:10372-10761 Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/changelog 2010-01-20 23:01:42 UTC (rev 10762) @@ -1,3 +1,17 @@ +plplot (5.9.5-1) unstable; urgency=low + + * New upstream release. + * debian/patches/series: Remove the following patches which are no longer + required as they are now included upstream + 13_fix-kfreeBSD-build.diff + 14_octave-3.0-fixes.diff + 15_octave-toggle-plplot-use.diff + * debian/patches/02_unset-python-path.diff, + debian/patches/04_use-mkoctfile.diff, + debian/patches/07_octave_prune_examples.diff, + debian/patches/16_wxwidget-with-cmake-2.8.diff: + + Update patches to work with plplot 5.9.5 + plplot (5.9.2-4) unstable; urgency=low * debian/patches/02_unset-python-path.diff: Fix offset in patch @@ -2,4 +16,22 @@ to remove quilt warning. (closes: #538533) + * debian/control.in: + + Remove arm build dependency on g++-4.1. (closes: #533806) + + Update build dependency on tcl / tk to 8.5 (compatible with + latest itcl). (closes: #545302) + + Add dpkg (>=1.15.4) | install-info dependency for plplot-doc to correctly + handle info install triggers. Fixes lintian warning. + + Bump debian standards version to 3.8.3. + + Fix typo in java bindings package description. (closes: #557677) + + Add ${misc:Depends} to all binary package dependencies. Fixes lintian + warning. + * debian/control.in, debian/rules: + + Update java to build-dep on default-jdk and runtime depend on default-jre + which should work for all architectures. + + Update ada packages so built on all architectures except armel where gnat + seems to be unavailable. (closes: #544187) + * debian/patches/16_wxwidget-with-cmake-2.8.diff: New patch ported from + upstream to fix wxwidget build with cmake 2.8.0. + * debian/control.in: Bump wxgtk version to 2.8. Require cmake 2.8.0 to build. - -- Andrew Ross <and...@us...> Thu, 20 Aug 2009 13:40:07 +0100 + -- Andrew Ross <and...@us...> Wed, 23 Aug 2009 12:05:07 +0100 Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/control.in 2010-01-20 23:01:42 UTC (rev 10762) @@ -3,21 +3,21 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.8.1 -Build-Depends: cmake (>= 2.4.5), debhelper (>= 7), g++-4.1 [arm], - tcl8.4-dev, tk8.4-dev, itcl3-dev, libx11-dev, libxext-dev, +Standards-Version: 3.8.3 +Build-Depends: cmake (>= 2.8.0), debhelper (>= 7), + tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, libgnomeprintui2.2-dev, libgnomeui-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, quilt, slice, - python-gtk2-dev, libwxgtk2.6-dev, python-gnome2-dev, + python-gtk2-dev, libwxgtk2.8-dev, python-gnome2-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk-builddep [!alpha !arm !hppa !hurd-i386], + python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex -Build-Conflicts: libplplot5, octave2.1-headers, tcl8.5, tcl8.5-dev +Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian @@ -27,7 +27,7 @@ Architecture: any Section: libs Conflicts: libplplot5, plplot (<< 5) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl Description: Scientific plotting library @@ -48,7 +48,8 @@ Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, - libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):] + libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], + ${misc:Depends} Description: Scientific plotting library (development files) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -68,7 +69,7 @@ Section: libs Conflicts: libplplot5, libplplot-c++9 Replaces: libplplot-c++9 -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (C++ binding) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -83,7 +84,7 @@ Package: libplplot-fortran9 Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends} , ${misc:Depends} Description: Scientific plotting library (fortran bindings) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -96,10 +97,10 @@ This package contains the Fortran 77 and Fortran 95 bindings for PLplot. -[JAVA:Package: libplplot9-java +Package: libplplot9-java Architecture: any Section: java -Depends: java-gcj-compat, ${shlibs:Depends} +Depends: default-jre, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (Java bindings) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -109,13 +110,13 @@ handful of function calls is typically required. For more advanced use, virtually all aspects of plotting are configurable. . - This packages contains the Java bindings for PLplot. -:] + This package contains the Java bindings for PLplot. + Package: libcsiro0 Architecture: any Section: libs Conflicts: libplplot5, libplplot9 (<< 5.3.0.cvs.20040303) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (CSIRO libraries) This package contains two libraries developed by Pavel Sakov, from the CSIRO Marine Research, used in geometry applications: @@ -129,7 +130,7 @@ Package: plplot-bin Architecture: any Conflicts: libplplot9 (<= 5.3.0-4), plplot (<< 5) -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (utilities) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -148,7 +149,7 @@ Package: plplot9-driver-xwin Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot-lib, plplot (<< 5) Description: Scientific plotting library (X11 driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -164,7 +165,7 @@ Package: plplot9-driver-gnome2 Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends} +Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-gnome Replaces: plplot9-driver-gnome Description: Scientific plotting library (GNOME Canvas Widget driver) @@ -182,7 +183,7 @@ Package: plplot9-driver-wxwidgets Architecture: any Section: libs -Depends: libplplot9, ${shlibs:Depends} +Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} Description: Scientific plotting library (wxWidgets driver) PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -197,7 +198,7 @@ Package: plplot-tcl Architecture: any Priority: extra -Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends} +Depends: plplot9-driver-xwin, iwidgets4, ${shlibs:Depends}, ${misc:Depends} Description: Tcl/Tk support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -215,7 +216,7 @@ Package: plplot-tcl-dev Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), plplot-tcl +Depends: libplplot9 (= ${binary:Version}), plplot-tcl, ${misc:Depends} Conflicts: plplot-tcl (<= 5.2.0.cvs.20030224-1) Description: Tcl/Tk development support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -232,7 +233,7 @@ Package: plplot9-driver-gd Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: ttf-freefont Description: Scientific plotting library (GD driver) PLplot is relatively small, portable, freely distributable, and is rich @@ -249,7 +250,7 @@ Package: plplot9-driver-cairo Architecture: any Section: libs -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: plplot9-driver-psttf Replaces: plplot9-driver-psttf Description: Scientific plotting library (Cairo driver) @@ -269,7 +270,7 @@ Architecture: any Section: python Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, - ${python:Depends}, python-numpy + ${python:Depends}, python-numpy, ${misc:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library @@ -288,7 +289,8 @@ Package: octave-plplot Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends} +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${octave:Depends}, + ${misc:Depends} Description: Octave support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -305,7 +307,7 @@ [ADA:Package: libplplot-ada Architecture: any Priority: extra -Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends} +Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: Ada support for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including @@ -322,6 +324,7 @@ Architecture: all Section: doc Suggests: libplplot-dev +Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} Description: Documentation for PLplot, a plotting library PLplot is relatively small, portable, freely distributable, and is rich enough to satisfy most users. It has a wide range of plot types including Modified: branches/v5_9_5_debian/debian/patches/02_unset-python-path.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/02_unset-python-path.diff 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/patches/02_unset-python-path.diff 2010-01-20 23:01:42 UTC (rev 10762) @@ -9,12 +9,12 @@ --- plplot/examples/python/CMakeLists.txt.old +++ plplot/examples/python/CMakeLists.txt -@@ -161,7 +161,7 @@ - @ONLY - ) - +@@ -195,7 +195,7 @@ + @ONLY + ) + -set(python_location1 ${PYTHON_INSTDIR}) +set(python_location1) set(python_location2) + set(python_location3) configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake Modified: branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff 2010-01-20 23:01:42 UTC (rev 10762) @@ -5,110 +5,81 @@ @DPATCH@ ---- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt -+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -133,64 +133,34 @@ - ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h - ) +--- plplot-5.9.5.orig/bindings/octave/CMakeLists.txt ++++ plplot-5.9.5/bindings/octave/CMakeLists.txt +@@ -134,49 +134,6 @@ + ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h + ) --# Build octave interface. --set(octave_interface_INCLUDE_PATHS --${CMAKE_SOURCE_DIR}/include --${CMAKE_BINARY_DIR} --${CMAKE_BINARY_DIR}/include --${CMAKE_CURRENT_SOURCE_DIR} --${CMAKE_CURRENT_BINARY_DIR} --${OCTAVE_INCLUDE_PATH} --) --include_directories(${octave_interface_INCLUDE_PATHS}) +- # Build octave interface. +- set(octave_interface_INCLUDE_PATHS +- ${CMAKE_SOURCE_DIR}/include +- ${CMAKE_BINARY_DIR} +- ${CMAKE_BINARY_DIR}/include +- ${CMAKE_CURRENT_SOURCE_DIR} +- ${CMAKE_CURRENT_BINARY_DIR} +- ${OCTAVE_INCLUDE_PATH} +- ) +- include_directories(${octave_interface_INCLUDE_PATHS}) - --add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) --target_link_libraries( --plplot_octave --plplot${LIB_TAG} --"${OCTAVE_LIBRARIES}" --"${OCTINTERP_LIBRARIES}" --) +- add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) +- target_link_libraries( +- plplot_octave +- plplot${LIB_TAG} +- "${OCTAVE_LIBRARIES}" +- "${OCTINTERP_LIBRARIES}" +- ) - --if(USE_RPATH) -- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) -- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and -- # OCTINTERP_LIBRARIES have the same path. -- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) -- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_RPATH "${LIB_INSTALL_RPATH}" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --else(USE_RPATH) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --endif(USE_RPATH) +- if(USE_RPATH) +- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) +- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and +- # OCTINTERP_LIBRARIES have the same path. +- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) +- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_RPATH "${LIB_INSTALL_RPATH}" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +- else(USE_RPATH) +- set_target_properties( +- plplot_octave +- PROPERTIES +- PREFIX "" +- SUFFIX ".oct" +- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" +- ) +- endif(USE_RPATH) - - # Have to be specific about permissions for some reason (probably oct suffix). - set(PERM_MODULES - OWNER_READ - OWNER_WRITE - OWNER_EXECUTE - GROUP_READ - GROUP_EXECUTE - WORLD_READ - WORLD_EXECUTE - ) + # Have to be specific about permissions for some reason (probably oct suffix). + set(PERM_MODULES + OWNER_READ +@@ -188,9 +145,23 @@ + WORLD_EXECUTE + ) -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave -+-I${CMAKE_SOURCE_DIR}/include --strip -+-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} -+) +- install(TARGETS plplot_octave ++ add_custom_command( ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++ COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc ++ -I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave ++ -I${CMAKE_SOURCE_DIR}/include --strip ++ -L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} ++ ) + -+add_custom_target( -+plplot_octave_oct_file ALL -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+) -+ - install( --TARGETS --plplot_octave --LIBRARY -+FILES -+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - DESTINATION ${OCTAVE_OCT_DIR} - PERMISSIONS ${PERM_MODULES} - ) -@@ -238,23 +208,4 @@ - DESTINATION ${PLPLOT_OCTAVE_DIR} - ) - --if(never) --add_custom_command( --OUTPUT --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --COMMAND --touch --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --DEPENDS --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc --) -- --# Link octave interface. --add_custom_target( --plplot_octave-libdir.oct ALL --DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --) --endif(never) - endif(ENABLE_octave) ++ add_custom_target( ++ plplot_octave_oct_file ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct ++ ) ++ ++ install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + EXPORT export_plplot +- LIBRARY + DESTINATION ${OCTAVE_OCT_DIR} + PERMISSIONS ${PERM_MODULES} + ) Modified: branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.diff 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.diff 2010-01-20 23:01:42 UTC (rev 10762) @@ -6,14 +6,14 @@ @DPATCH@ ---- plplot-5.8.0.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 -+++ plplot-5.8.0/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 -@@ -62,7 +62,7 @@ - # These require octave-2.1.50 so comment out since not everybody has - # this. - -- for i=[1:7 8 9 13 15 16] ; -+ for i=[1:6 8 9 13 15 16] ; - if (verbose_test) - printf("p%d\n",i); - endif +--- plplot-5.9.5.orig/plplot_test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 ++++ plplot-5.9.5/plplot_test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 +@@ -54,7 +54,7 @@ + + # p7 works OK with plmeta, e.g., but not ps or psc. pleop/plbop issue? + +- for i=[1:7 8 9 13 15 16 21] ; ++ for i=[1:6 8 9 13 15 16 21] ; + if (verbose_test) + printf("p%d\n",i); + endif Copied: branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff (from rev 10761, trunk/debian/patches/16_wxwidget-with-cmake-2.8.diff) =================================================================== --- branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff (rev 0) +++ branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff 2010-01-20 23:01:42 UTC (rev 10762) @@ -0,0 +1,71 @@ +# Patch from upstream to ensure wxwidgets support works with cmake 2.8.0 + +diff -ur plplot-5.9.2-orig/cmake/modules/wxwidgets.cmake plplot-5.9.2/cmake/modules/wxwidgets.cmake +--- plplot-5.9.2.orig/cmake/modules/wxwidgets.cmake 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/cmake/modules/wxwidgets.cmake 2010-01-18 23:52:40.000000000 +0000 +@@ -60,12 +60,21 @@ + wxwidgets_COMPILE_FLAGS + "-I${wxWidgets_INCLUDE_DIRS}" + ) +- # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) +- # when wxWidgets_DEFINITIONS is a list. ++ string(REGEX REPLACE ";" " -D" ++ wxWidgets_DEFINITIONS_wD ++ "-D${wxWidgets_DEFINITIONS}" ++ ) ++ set(wxWidgets_DEFINITIONS_DEBUG_wD "") ++ if(wxWidgets_DEFINITIONS_DEBUG) ++ string(REGEX REPLACE ";" " -D" ++ wxWidgets_DEFINITIONS_DEBUG_wD ++ "-D${wxWidgets_DEFINITIONS_DEBUG}" ++ ) ++ endif(wxWidgets_DEFINITIONS_DEBUG) + string(REGEX REPLACE ";" " " + wxwidgets_COMPILE_FLAGS + ${wxwidgets_COMPILE_FLAGS} +- " ${wxWidgets_DEFINITIONS}" ++ " ${wxWidgets_DEFINITIONS_wD} ${wxWidgets_DEFINITIONS_DEBUG_wD}" + ) + # Convert wxWidgets_LIBRARIES to full pathname form. + cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") +diff -ur plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt +--- plplot-5.9.2.orig/bindings/wxwidgets/CMakeLists.txt 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.2/bindings/wxwidgets/CMakeLists.txt 2010-01-18 23:55:55.000000000 +0000 +@@ -55,9 +55,18 @@ + endif(BUILD_SHARED_LIBS) + + INCLUDE_DIRECTORIES( ${wxWidgets_INCLUDE_DIRS} ) +- ADD_DEFINITIONS( ${wxWidgets_DEFINITIONS} ) + +- target_link_libraries( ++ IF(wxWidgets_DEFINITIONS) ++ SET_PROPERTY(DIRECTORY APPEND ++ PROPERTY COMPILE_DEFINITIONS ${wxWidgets_DEFINITIONS}) ++ ENDIF(wxWidgets_DEFINITIONS) ++ ++ IF(wxWidgets_DEFINITIONS_DEBUG) ++ SET_PROPERTY(DIRECTORY APPEND ++ PROPERTY COMPILE_DEFINITIONS_DEBUG ${wxWidgets_DEFINITIONS_DEBUG}) ++ ENDIF(wxWidgets_DEFINITIONS_DEBUG) ++ ++target_link_libraries( + plplotwxwidgets${LIB_TAG} + plplotcxx${LIB_TAG} + ${wxwidgets_LINK_FLAGS} +@@ -103,9 +112,14 @@ + endif(LIB_TAG) + + # Determine libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS +- STRING(REGEX REPLACE ";" " " ++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS}") ++ if(wxWidgets_DEFINITIONS_DEBUG) ++ set(wxWidgets_DEFINITIONS_all "${wxWidgets_DEFINITIONS};${wxWidgets_DEFINITIONS_DEBUG}") ++ endif(wxWidgets_DEFINITIONS_DEBUG) ++ ++ STRING(REGEX REPLACE ";" " -D" + libplplotwxwidgets${LIB_TAG}_COMPILE_FLAGS +- "${wxWidgets_DEFINITIONS}" ++ "-D${wxWidgets_DEFINITIONS_all}" + ) + STRING(REGEX REPLACE ";" " -I" + wxWidgets_IFLAGS Modified: branches/v5_9_5_debian/debian/patches/series =================================================================== --- branches/v5_9_5_debian/debian/patches/series 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/patches/series 2010-01-20 23:01:42 UTC (rev 10762) @@ -2,6 +2,4 @@ 04_use-mkoctfile.diff 07_octave_prune_examples.diff 11_minus-sign-manpage.diff -13_fix-kfreeBSD-build.diff -14_octave-3.0-fixes.diff -15_octave-toggle-plplot-use.diff +16_wxwidget-with-cmake-2.8.diff Modified: branches/v5_9_5_debian/debian/rules =================================================================== --- branches/v5_9_5_debian/debian/rules 2010-01-20 21:03:33 UTC (rev 10761) +++ branches/v5_9_5_debian/debian/rules 2010-01-20 23:01:42 UTC (rev 10762) @@ -26,27 +26,20 @@ debinfo := $(debshr)/info debex := $(debshr)/plplot$(version)/examples -JAVA_HOME = /usr/lib/jvm/java-gcj +JAVA_HOME = /usr/lib/jvm/default-java PYVERS = $(shell pyversions -vr) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Disable java and ada build on arm - problems with java-gcj-compat-dev -# at the moment. Also gnat not available on arm, mips, and mipsel. +# Disable Ada build on armel - gnat not available on armel at the moment. -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:armeb:armel:mips:mipsel:kfreebsd-amd64:)) +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:)) BUILD_ADA = no else BUILD_ADA = yes endif -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:alpha:arm:hppa:hurd-i386:)) -BUILD_JAVA = no -else -BUILD_JAVA = yes -endif - # Configure options ifeq ($(BUILD_ADA),yes) @@ -55,14 +48,10 @@ ADA_OPTIONS = -DENABLE_ada=OFF endif -ifeq ($(BUILD_JAVA),yes) JAVA_OPTIONS = \ -DCMAKE_Java_RUNTIME=$(JAVA_HOME)/bin/java \ -DCMAKE_Java_COMPILER=$(JAVA_HOME)/bin/javac \ -DCMAKE_Java_ARCHIVE=$(JAVA_HOME)/bin/jar -else -JAVA_OPTIONS = -DENABLE_java=OFF -endif CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ @@ -76,18 +65,10 @@ control: ifeq ($(BUILD_ADA),no) -ifeq ($(BUILD_JAVA),no) - slice -o UNDEF:debian/control debian/control.in -else - slice -o UNDEF+JAVA:debian/control debian/control.in -endif -else -ifeq ($(BUILD_JAVA),no) slice -o UNDEF+ADA:debian/control debian/control.in else - slice -o UNDEF+JAVA+ADA:debian/control debian/control.in + slice -o UNDEF+ADA:debian/control debian/control.in endif -endif config: config-stamp config-stamp: control @@ -133,9 +114,7 @@ --no-package=libplplot9-java --no-package=libplplot-ada dh_movefiles --package=python-plplot dh_movefiles --package=plplot-bin -ifeq ($(BUILD_JAVA),yes) dh_movefiles --package=libplplot9-java -endif ifeq ($(BUILD_ADA),yes) dh_movefiles --package=libplplot-ada dh_movefiles --package=libplplot-dev usr/share/ada @@ -170,11 +149,9 @@ ln -s $(libpkg) $(debdoc)/$$i ; \ done -ifeq ($(BUILD_JAVA),yes) ln -s $(libpkg) $(debdoc)/libplplot9-java mv $(debshr)/java/plplot.jar $(debshr)/java/plplot-$(version).jar ( cd $(debshr)/java ; ln -s plplot-$(version).jar plplot.jar ) -endif ifeq ($(BUILD_ADA),yes) ln -s $(libpkg) $(debdoc)/libplplot-ada This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-01-21 21:12:44
|
Revision: 10764 http://plplot.svn.sourceforge.net/plplot/?rev=10764&view=rev Author: andrewross Date: 2010-01-21 21:11:45 +0000 (Thu, 21 Jan 2010) Log Message: ----------- Fix several outstanding bugs in the debian 5.9.5 packages. Includes dropping support for the gcw driver. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/libplplot9.README.Debian branches/v5_9_5_debian/debian/rules Removed Paths: ------------- branches/v5_9_5_debian/debian/plplot9-driver-gnome2.files branches/v5_9_5_debian/debian/python-plplot-gnome2.files Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/changelog 2010-01-21 21:11:45 UTC (rev 10764) @@ -11,8 +11,18 @@ debian/patches/07_octave_prune_examples.diff, debian/patches/16_wxwidget-with-cmake-2.8.diff: + Update patches to work with plplot 5.9.5 + * debian/control.in, debian/rules: + + Properly enable support for ada on all architectures (except armel) + - build dependencies were not updated. + + Add sh4 to the list of architectures where gnat is not available and + so ada support is disabled. (closes: #562238) + + Drop the plplot9-driver-gnome2 package which is unmaintained + upstream and depends on libgnomeprintui-2.2 which is to be dropped + from Debian. (closes: #542577) + * Rebuild package to use latest versions of gfortran (closes: #564065) + and python (closes: #562411) -plplot (5.9.2-4) unstable; urgency=low +plplot (5.9.2-4) UNRELEASED; urgency=low * debian/patches/02_unset-python-path.diff: Fix offset in patch to remove quilt warning. (closes: #538533) Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/control.in 2010-01-21 21:11:45 UTC (rev 10764) @@ -7,14 +7,12 @@ Build-Depends: cmake (>= 2.8.0), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), - libgd2-noxpm-dev | libgd2-xpm-dev, libgnome2-dev, - libgnomeprintui2.2-dev, libgnomeui-dev, - m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, - libltdl3-dev, pkg-config, quilt, slice, - python-gtk2-dev, libwxgtk2.8-dev, python-gnome2-dev, + libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), + libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, + quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, - fastjar, swig, gnat [!alpha !arm !armeb !armel !mips !mipsel !kfreebsd-amd64] + fastjar, swig, gnat [!armel !sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex Build-Conflicts: libplplot5, octave2.1-headers @@ -28,7 +26,7 @@ Section: libs Conflicts: libplplot5, plplot (<< 5) Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: plplot9-driver-xwin, plplot9-driver-gnome2, plplot9-driver-gd, +Suggests: plplot9-driver-xwin, plplot9-driver-gd, plplot9-driver-cairo, plplot9-driver-wxwidgets, plplot-tcl Description: Scientific plotting library PLplot is relatively small, portable, freely distributable, and is rich @@ -47,7 +45,7 @@ Section: libdevel Recommends: pkg-config Depends: libplplot9 (= ${binary:Version}), libqhull-dev, libfreetype6-dev, - libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), plplot9-driver-gnome2, + libltdl3-dev, libplplot-c++9c2 (= ${binary:Version}), libplplot-fortran9 (= ${binary:Version})[ADA:, libplplot-ada (= ${binary:Version}):], ${misc:Depends} Description: Scientific plotting library (development files) @@ -162,24 +160,6 @@ . This package provides the X11 driver module for PLplot. -Package: plplot9-driver-gnome2 -Architecture: any -Section: libs -Depends: libplplot9, ${shlibs:Depends}, ${misc:Depends} -Conflicts: plplot9-driver-gnome -Replaces: plplot9-driver-gnome -Description: Scientific plotting library (GNOME Canvas Widget driver) - PLplot is relatively small, portable, freely distributable, and is rich - enough to satisfy most users. It has a wide range of plot types including - line (linear, log), contour, 3D, fill, and almost 1000 characters - (including Greek and mathematical) in its extended font set. The package - is designed to make it easy to quickly get graphical output; only a - handful of function calls is typically required. For more advanced use, - virtually all aspects of plotting are configurable. - . - This package provides the GNOME Canvas Widget driver module for PLplot. - This package replaces the (now deprecated) plplot9-driver-gnome package. - Package: plplot9-driver-wxwidgets Architecture: any Section: libs Modified: branches/v5_9_5_debian/debian/libplplot9.README.Debian =================================================================== --- branches/v5_9_5_debian/debian/libplplot9.README.Debian 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/libplplot9.README.Debian 2010-01-21 21:11:45 UTC (rev 10764) @@ -30,8 +30,6 @@ * plplot9-driver-gd: Provides the GD driver module, which allows direct generation of PNG and JPEG files. - * plplot9-driver-gnome2: Provides the Gnome canvas driver module. - * plplot9-driver-cairo: Provides the cairo driver module. This uses the cairo library to produce higher quality text using truetype fonts. It produces postscript, pdf, svg, png, mem and X output. Deleted: branches/v5_9_5_debian/debian/plplot9-driver-gnome2.files =================================================================== --- branches/v5_9_5_debian/debian/plplot9-driver-gnome2.files 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/plplot9-driver-gnome2.files 2010-01-21 21:11:45 UTC (rev 10764) @@ -1,3 +0,0 @@ -usr/lib/libplplotgnome2d.so.* -usr/lib/plplot*/driversd/gcw.* -usr/share/doc/plplot9-driver-gnome2 Deleted: branches/v5_9_5_debian/debian/python-plplot-gnome2.files =================================================================== --- branches/v5_9_5_debian/debian/python-plplot-gnome2.files 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/python-plplot-gnome2.files 2010-01-21 21:11:45 UTC (rev 10764) @@ -1,4 +0,0 @@ -usr/lib/python*/*/gcw* -usr/lib/python*/*/*plplotcanvas* -usr/share/doc/libplplot9/examples/python/*plplotcanvas* -usr/share/doc/python-plplot-gnome2 Modified: branches/v5_9_5_debian/debian/rules =================================================================== --- branches/v5_9_5_debian/debian/rules 2010-01-21 20:15:00 UTC (rev 10763) +++ branches/v5_9_5_debian/debian/rules 2010-01-21 21:11:45 UTC (rev 10764) @@ -144,7 +144,7 @@ for i in libplplot-dev plplot-tcl plplot-tcl-dev \ plplot9-driver-gd plplot9-driver-xwin octave-plplot \ python-plplot plplot-bin libplplot-c++9c2 \ - plplot9-driver-gnome2 plplot9-driver-wxwidgets \ + plplot9-driver-wxwidgets \ plplot9-driver-cairo libplplot-fortran9 ; do \ ln -s $(libpkg) $(debdoc)/$$i ; \ done @@ -177,8 +177,8 @@ install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DENABLE_pygcw=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ - for d in gnome2/python python ; do \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ + for d in python ; do \ ( cd bindings/$$d; \ $(MAKE) clean ; \ $(MAKE) ; \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-01-22 21:46:19
|
Revision: 10765 http://plplot.svn.sourceforge.net/plplot/?rev=10765&view=rev Author: andrewross Date: 2010-01-22 21:46:11 +0000 (Fri, 22 Jan 2010) Log Message: ----------- Further changes to Debian 5.9.5 packaing. Remove unused patches. Fix up some issues with mkoctfile patch. Update dependencies. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff branches/v5_9_5_debian/debian/rules Removed Paths: ------------- branches/v5_9_5_debian/debian/patches/00list branches/v5_9_5_debian/debian/patches/01_check-for-octave2.9.dpatch branches/v5_9_5_debian/debian/patches/02_unset-python-path.dpatch branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.dpatch branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.dpatch branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.diff branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.dpatch branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.diff branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.dpatch branches/v5_9_5_debian/debian/patches/11_minus-sign-manpage.dpatch branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.diff branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.dpatch branches/v5_9_5_debian/debian/patches/13_fix-kfreeBSD-build.diff branches/v5_9_5_debian/debian/patches/14_octave-3.0-fixes.diff branches/v5_9_5_debian/debian/patches/15_octave-toggle-plplot-use.diff Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/changelog 2010-01-22 21:46:11 UTC (rev 10765) @@ -6,6 +6,7 @@ 13_fix-kfreeBSD-build.diff 14_octave-3.0-fixes.diff 15_octave-toggle-plplot-use.diff + and clean up directory by deleting unused patches. * debian/patches/02_unset-python-path.diff, debian/patches/04_use-mkoctfile.diff, debian/patches/07_octave_prune_examples.diff, @@ -19,9 +20,16 @@ + Drop the plplot9-driver-gnome2 package which is unmaintained upstream and depends on libgnomeprintui-2.2 which is to be dropped from Debian. (closes: #542577) + + Ensure ghostscript is installed in Build-Depends-Indep: since this + is needed to generate fonts for pdfjadetex, but is not automatically + pulled in. + * debian/rules: Remove setting of ITCL_LIBRARY which is not required + with latest version of itcl. * Rebuild package to use latest versions of gfortran (closes: #564065) and python (closes: #562411) + -- Andrew Ross <and...@us...> Thu, 21 Jan 2010 21:05:07 +0000 + plplot (5.9.2-4) UNRELEASED; urgency=low * debian/patches/02_unset-python-path.diff: Fix offset in patch Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/control.in 2010-01-22 21:46:11 UTC (rev 10765) @@ -14,7 +14,7 @@ python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, fastjar, swig, gnat [!armel !sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, - docbook2x, opensp, jadetex + docbook2x, opensp, jadetex, ghostscript Build-Conflicts: libplplot5, octave2.1-headers XS-Python-Version: all Homepage: http://www.plplot.org Deleted: branches/v5_9_5_debian/debian/patches/00list =================================================================== --- branches/v5_9_5_debian/debian/patches/00list 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/00list 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,8 +0,0 @@ -01_check-for-octave2.9 -02_unset-python-path -04_use-mkoctfile -07_octave_prune_examples -09_pdftex-EC-encoding -10_print-usage-octave-3.0 -11_minus-sign-manpage -12_cmake-2.6-fixes.dpatch Deleted: branches/v5_9_5_debian/debian/patches/01_check-for-octave2.9.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/01_check-for-octave2.9.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/01_check-for-octave2.9.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_check-for-octave2.9.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Abort toggle_plplot_use if not using Octave 2.9 or newer - -@DPATCH@ - ---- plplot-5.6.0.rc1.5.6.1.orig/bindings/octave/PLplot/toggle_plplot_use.m -+++ plplot-5.6.0.rc1.5.6.1/bindings/octave/PLplot/toggle_plplot_use.m -@@ -20,6 +20,11 @@ - - 1; - -+## Abort if not using Octave 2.9 or newer -+if ! ((split (version , '.') (1, 1) == '2' && split (version , '.') (1, 2) == '9') || split (version , '.') (1, 1) > '2' ) -+ error ("This version of octave-plplot only works with Octave 2.9 or newer\n"); -+endif -+ - if ! exist ("use_plplot_state") - global use_plplot_state - use_plplot_state = "on"; Deleted: branches/v5_9_5_debian/debian/patches/02_unset-python-path.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/02_unset-python-path.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/02_unset-python-path.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_unset-python-path.dpatch by <and...@us...> -## -## DP: No need to explicitly set python path with debian since the -## DP: default path is correct. This ensure the examples work with -## DP: multiple version of python. - -@DPATCH@ - ---- plplot/examples/python/CMakeLists.txt.old -+++ plplot/examples/python/CMakeLists.txt -@@ -147,7 +147,7 @@ - @ONLY - ) - --set(python_location1 ${PYTHON_INSTDIR}) -+set(python_location1) - set(python_location2) - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/plplot_python_start.py.cmake Modified: branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.diff 2010-01-22 21:46:11 UTC (rev 10765) @@ -57,11 +57,10 @@ # Have to be specific about permissions for some reason (probably oct suffix). set(PERM_MODULES OWNER_READ -@@ -188,9 +145,23 @@ +@@ -188,9 +145,22 @@ WORLD_EXECUTE ) -- install(TARGETS plplot_octave + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc @@ -76,9 +75,10 @@ + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct + ) + -+ install( ++ install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - EXPORT export_plplot +- install(TARGETS plplot_octave +- EXPORT export_plplot - LIBRARY DESTINATION ${OCTAVE_OCT_DIR} PERMISSIONS ${PERM_MODULES} Deleted: branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/04_use-mkoctfile.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,114 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_use-mkoctfile.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Build plplot_octave.oct using mkoctfile and not as a shared library - -@DPATCH@ - ---- plplot-5.8.0~RC1.orig/bindings/octave/CMakeLists.txt -+++ plplot-5.8.0~RC1/bindings/octave/CMakeLists.txt -@@ -133,64 +133,34 @@ - ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h - ) - --# Build octave interface. --set(octave_interface_INCLUDE_PATHS --${CMAKE_SOURCE_DIR}/include --${CMAKE_BINARY_DIR} --${CMAKE_BINARY_DIR}/include --${CMAKE_CURRENT_SOURCE_DIR} --${CMAKE_CURRENT_BINARY_DIR} --${OCTAVE_INCLUDE_PATH} --) --include_directories(${octave_interface_INCLUDE_PATHS}) -- --add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc) --target_link_libraries( --plplot_octave --plplot${LIB_TAG} --"${OCTAVE_LIBRARIES}" --"${OCTINTERP_LIBRARIES}" --) -- --if(USE_RPATH) -- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) -- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and -- # OCTINTERP_LIBRARIES have the same path. -- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH) -- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH}) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_RPATH "${LIB_INSTALL_RPATH}" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --else(USE_RPATH) -- set_target_properties( -- plplot_octave -- PROPERTIES -- PREFIX "" -- SUFFIX ".oct" -- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}" -- ) --endif(USE_RPATH) -- - # Have to be specific about permissions for some reason (probably oct suffix). - set(PERM_MODULES - OWNER_READ - OWNER_WRITE - OWNER_EXECUTE - GROUP_READ - GROUP_EXECUTE - WORLD_READ - WORLD_EXECUTE - ) - -+add_custom_command( -+OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+COMMAND ${MKOCTFILE} ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc -+-I${CMAKE_CURRENT_BINARY_DIR} -I${CMAKE_SOURCE_DIR}/bindings/octave -+-I${CMAKE_SOURCE_DIR}/include --strip -+-L${CMAKE_BINARY_DIR}/src -lplplot${LIB_TAG} -+) -+ -+add_custom_target( -+plplot_octave_oct_file ALL -+DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct -+) -+ - install( --TARGETS --plplot_octave --LIBRARY -+FILES -+${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct - DESTINATION ${OCTAVE_OCT_DIR} - PERMISSIONS ${PERM_MODULES} - ) -@@ -238,23 +208,4 @@ - DESTINATION ${PLPLOT_OCTAVE_DIR} - ) - --if(never) --add_custom_command( --OUTPUT --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --COMMAND --touch --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --DEPENDS --${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc --) -- --# Link octave interface. --add_custom_target( --plplot_octave-libdir.oct ALL --DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o --) --endif(never) - endif(ENABLE_octave) Deleted: branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/07_octave_prune_examples.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 07_octave_prune_examples.dpatch by Andrew Ross <and...@us...> -## -## DP: Don't run example p7 as part of ctest. It does not work well with postscript -## DP: and also fails on the alpha architecure, for reasons as yet unknown. - -@DPATCH@ - ---- plplot-5.8.0.orig/test/test_octave.sh.in 2007-10-16 07:57:38.000000000 +0100 -+++ plplot-5.8.0/test/test_octave.sh.in 2007-12-07 15:02:43.000000000 +0000 -@@ -45,7 +45,7 @@ - # These require octave-2.1.50 so comment out since not everybody has - # this. - --for i=[1:7 8 9 13 15 16]; -+for i=[1:6 8 9 13 15 16]; - figure(i,"$device",sprintf("${OUTPUT_DIR}/p%d.$dsuffix",i)); - feval(sprintf("p%d",i)) - closefig - Deleted: branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.diff 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.diff 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,69 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> -## -## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian - -@DPATCH@ - ---- plplot-5.8.0.orig/doc/docbook/src/pdftex.map -+++ plplot-5.8.0/doc/docbook/src/pdftex.map -@@ -1,31 +1,31 @@ --cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb -+cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb - cmmi10 <cmmi10.pfb - cmsy10 <cmsy10.pfb - cmsy9 <cmsy9.pfb --ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb --ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb --ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb --ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb --tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb -+ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb -+ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb -+ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb -+ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb -+tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Deleted: branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/09_pdftex-EC-encoding.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,69 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 09_pdftex-EC-encoding by Rafael Laboissiere <ra...@de...> -## -## DP: Use ec.enc file instead of EC.enc, which does not exist in Debian - -@DPATCH@ - ---- plplot-5.8.0.orig/doc/docbook/src/pdftex.map -+++ plplot-5.8.0/doc/docbook/src/pdftex.map -@@ -1,31 +1,31 @@ --cmr10 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb -+cmr10 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb - cmmi10 <cmmi10.pfb - cmsy10 <cmsy10.pfb - cmsy9 <cmsy9.pfb --ectt0800 "ECEncoding ReEncodeFont"<EC.enc <cmtt8.pfb --ecit0900 "0.9 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --ecit1000 "ECEncoding ReEncodeFont"<EC.enc <cmitt10.pfb --tcrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecrm0600 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ectt0900 "ECEncoding ReEncodeFont"<EC.enc <cmtt9.pfb --ecti1000 "ECEncoding ReEncodeFont"<EC.enc <cmti10.pfb --ecbx1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrb1000 "ECEncoding ReEncodeFont"<EC.enc <cmbx10.pfb --ecrm0800 "ECEncoding ReEncodeFont"<EC.enc <cmr8.pfb --ecti0800 "ECEncoding ReEncodeFont"<EC.enc <cmti8.pfb --tcrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm1000 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecrm0900 "ECEncoding ReEncodeFont"<EC.enc <cmr10.pfb --ecsx1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecss1000 "ECEncoding ReEncodeFont"<EC.enc <cmssbx10.pfb --ecsx1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1200 "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1440 "1.2 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecss1728 "1.44 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss12.pfb --ecsx2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2074 "1.0165 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecsx2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ecss2488 "1.4635 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmss17.pfb --ectt1095 "1.095 ExtendFont" "ECEncoding ReEncodeFont"<EC.enc <cmtt10.pfb -+ectt0800 "ecEncoding ReEncodeFont"<ec.enc <cmtt8.pfb -+ecit0900 "0.9 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+ecit1000 "ecEncoding ReEncodeFont"<ec.enc <cmitt10.pfb -+tcrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecrm0600 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ectt0900 "ecEncoding ReEncodeFont"<ec.enc <cmtt9.pfb -+ecti1000 "ecEncoding ReEncodeFont"<ec.enc <cmti10.pfb -+ecbx1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrb1000 "ecEncoding ReEncodeFont"<ec.enc <cmbx10.pfb -+ecrm0800 "ecEncoding ReEncodeFont"<ec.enc <cmr8.pfb -+ecti0800 "ecEncoding ReEncodeFont"<ec.enc <cmti8.pfb -+tcrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm1000 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecrm0900 "ecEncoding ReEncodeFont"<ec.enc <cmr10.pfb -+ecsx1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecss1000 "ecEncoding ReEncodeFont"<ec.enc <cmssbx10.pfb -+ecsx1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1200 "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1440 "1.2 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecss1728 "1.44 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss12.pfb -+ecsx2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2074 "1.0165 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecsx2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ecss2488 "1.4635 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmss17.pfb -+ectt1095 "1.095 ExtendFont" "ecEncoding ReEncodeFont"<ec.enc <cmtt10.pfb Deleted: branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.diff 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.diff 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Use correct call to print_usage in wrap_octave.pl when compiling -## DP: against octave3.0 - -@DPATCH@ - ---- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl -+++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl -@@ -10,7 +10,7 @@ - # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the - # perl artistic license (http://language.perl.com/misc/Artistic.html). - # --# Modifications 2007 Andrew Ross -+# Modifications 2007 Andrew Ross - # This version contains three local fixes for plplot - # 1) Change _dim function to allow a zero length array (required by plstyl) - # 2) Alter string to std::string for compatibility with gcc3.2 and later -@@ -18,6 +18,9 @@ - # from v2.1 to v2.9. This requires a file octave_version.pl which defines - # the variable octave_version. - # -+# Modifications 2008 Rafael Laboissiere -+# Change 3) above is adapted for Octave v3.0 -+ - - package octave; # Everything should be in this package. - -@@ -158,7 +161,7 @@ - # Permissible not to specify output args - # if there is only one. - @ver = split(/\./,$octave_version); -- if ($ver[0] >= 2 && $ver[1] >= 9) { -+ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { - $retstr .= (")\n" . - " {\n" . - " print_usage();\n" . # Give an error. Deleted: branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/10_print-usage-octave-3.0.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10_print-usage-octave-3.0.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Use correct call to print_usage in wrap_octave.pl when compiling -## DP: against octave3.0 - -@DPATCH@ - ---- plplot-5.9.0.orig/bindings/octave/matwrap/wrap_octave.pl -+++ plplot-5.9.0/bindings/octave/matwrap/wrap_octave.pl -@@ -10,7 +10,7 @@ - # Copyright (c) 1997 Gary R. Holt. This is distributed under the terms of the - # perl artistic license (http://language.perl.com/misc/Artistic.html). - # --# Modifications 2007 Andrew Ross -+# Modifications 2007 Andrew Ross - # This version contains three local fixes for plplot - # 1) Change _dim function to allow a zero length array (required by plstyl) - # 2) Alter string to std::string for compatibility with gcc3.2 and later -@@ -18,6 +18,9 @@ - # from v2.1 to v2.9. This requires a file octave_version.pl which defines - # the variable octave_version. - # -+# Modifications 2008 Rafael Laboissiere -+# Change 3) above is adapted for Octave v3.0 -+ - - package octave; # Everything should be in this package. - -@@ -158,7 +161,7 @@ - # Permissible not to specify output args - # if there is only one. - @ver = split(/\./,$octave_version); -- if ($ver[0] >= 2 && $ver[1] >= 9) { -+ if ($ver[0] >= 3 || ($ver[0] >= 2 && $ver[1] >= 9)) { - $retstr .= (")\n" . - " {\n" . - " print_usage();\n" . # Give an error. Deleted: branches/v5_9_5_debian/debian/patches/11_minus-sign-manpage.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/11_minus-sign-manpage.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/11_minus-sign-manpage.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,22 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_minus-sign-manpage.dpatch by Rafael Laboissiere <ra...@de...> -## -## DP: Escape "-" signs that mean the "minus" character - -@DPATCH@ - ---- plplot-5.9.0.orig/doc/plserver.1 -+++ plplot-5.9.0/doc/plserver.1 -@@ -14,10 +14,10 @@ - is just a front-end to the pltkMain() function. Structured along the - preferred lines for extended wish'es. It typically runs as a child - process from the PLplot TK driver to render output. Can use either TK --send or Tcl-DP RPC for communication, depending on how it is invoked. -+send or Tcl\-DP RPC for communication, depending on how it is invoked. - .PP - Note that plserver can be used the same way as wish or dpwish, as it --contains the functionality of each of these (except the -notk Tcl-DP -+contains the functionality of each of these (except the \-notk Tcl-DP - command-line option is not supported). - .SH "SEE ALSO" - See /usr/share/doc/plplot/plplot.ps.gz for more details. Deleted: branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.diff 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.diff 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,364 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_cmake-2.6-fixes.dpatch by <and...@us...> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the build system to work with cmake 2.6. -## DP: This patch is extracted from the upstream SVN version of plplot. - -@DPATCH@ - -diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt ---- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 -+++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 -@@ -141,14 +141,30 @@ - RUNTIME DESTINATION ${BIN_DIR} - ) - --# Yuk! All Makefiles are run from the top level build directory and --# so the f90 .mod files end up there rather than in the bindings/f95 --# directory. Ifort and pgf90 both have a -module command line option to --# override this location, but I'm not sure how portable that? --install( --FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod --DESTINATION ${F95_MOD_DIR} --) -+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Yuk! All Makefiles are run from the top level build directory and -+ # so the f90 .mod files end up there rather than in the bindings/f95 -+ # directory. Ifort and pgf90 both have a -module command line option to -+ # override this location, but I'm not sure how portable that? -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/plplot.mod -+ ${CMAKE_BINARY_DIR}/plplotp.mod -+ ${CMAKE_BINARY_DIR}/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # For the current cvs version of CMake, the module files are created by -+ # default during the library build in the more logical bindings/f95 -+ # directory. -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - - # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} - if(PKG_CONFIG_EXECUTABLE) -diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake ---- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 -@@ -97,13 +97,7 @@ - string(REGEX REPLACE ";" " " - cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" - ) -- # Convert X linker information to preferred CMake form before appending -- # it to already converted ${linkflags} -- cmake_link_flags( -- cairo_X_LINK_FLAGS -- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" -- ) -- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) -+ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) - else(PLD_xcairo AND X11_COMPILE_FLAGS) - message(STATUS - "WARNING: X windows not found. Setting xcairo driver to OFF." -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 -@@ -14,3 +14,4 @@ - ELSE(UNIX OR MINGW) - SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) - ENDIF(UNIX OR MINGW) -+SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 -@@ -41,9 +41,9 @@ - SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) - --IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) --ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - - IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) -@@ -53,6 +53,10 @@ - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) -+ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ - # repeat for modules - IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) - SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) -@@ -70,6 +74,22 @@ - SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ -+IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ - IF(NOT CMAKE_INCLUDE_FLAG_Ada) - SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) - ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) -@@ -85,7 +105,12 @@ - - SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") - --SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING -+SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") -+# avoid just having a space as the initial value for the cache -+IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+ SET(CMAKE_Ada_FLAGS_INIT) -+ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING - "Flags for Ada compiler.") - - INCLUDE(CMakeCommonLanguageInclude) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 -@@ -17,6 +17,8 @@ - - FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt - " -+# FIXME: This specific location currently needs to be changed whenever the -+# location of the experimental Ada support files is changed. - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) - project(test Ada) -diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake ---- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 -@@ -20,10 +20,10 @@ - # Module for determining pkg-config configuration variables related to the - # install-tree build of the examples. - # Also create useful macros called pkg_check_pkgconfig to emulate the --# pkgconfig macro using the pkg_check_modules macro, --# cmake_to_pkg_config_link_flags to process CMake link flags into -+# pkgconfig macro using the pkg_check_modules macro; -+# pkg_config_link_flags to process CMake link flags into - # pkg-config standard form for the configured output *.pc files, and --# pkg_config_to_cmake_link_flags to process input link flags delivered -+# cmake_link_flags to process input link flags delivered - # by pkg-config into CMake standard form. - - # The following variables are set: -@@ -155,8 +155,10 @@ - set(${_link_flags_out}) - else("${_link_flags_in}" STREQUAL ""}) - #message("(original link flags) = ${_link_flags_in}") -- # Convert link flags to a list. -- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") -+ # Convert link flags to a list. Note some link flags are blank-delimited -+ # (such as "-framework whatever") so preserve those by splitting into -+ # separate list elements only if the next element starts with a hyphen. -+ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") - # Extract list of directories from -L options. - list(LENGTH _link_flags_list _link_flags_length) - math(EXPR _link_flags_length "${_link_flags_length} - 1") -@@ -164,7 +166,7 @@ - set(_link_directory_list) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-L${_list_element1}") - list(APPEND _index_list ${_list_index}) - list(APPEND _link_directory_list ${_list_element1}) -@@ -186,7 +188,7 @@ - set(${_link_flags_out}) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-l${_list_element1}") - set(_library_pathname "_library_pathname-NOTFOUND") - find_library( -diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake ---- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 -@@ -135,12 +135,7 @@ - endif(ENABLE_tk AND NOT X11_FOUND) - if(ENABLE_tk) - set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) -- set( -- TK_LIBRARY -- ${TK_LIBRARY} -- -L${X11_LIBRARY_DIR} -- ${X11_LIBRARIES} -- ) -+ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) - message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") - message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") - else(ENABLE_tk) -@@ -157,7 +152,7 @@ - message(STATUS "Looking for itk library") - set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itk_library_versions}) -- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} -+ find_library(ITK_LIBRARY itk${version} - PATH_SUFFIXES itk${version}) - endforeach(version ${itk_library_versions}) - if(ITK_LIBRARY) -diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake ---- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 -@@ -23,8 +23,10 @@ - # PLD_wxwidgets - ON means the wxwidgets device is enabled. - # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets - # device. --# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. --# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. -+# wxwidgets_LINK_FLAGS - list of full path names of libraries and -+# linker flags for dynamic wxwidgets device driver. -+# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case -+# when ENABLE_DYNDRIVERS OFF. - - # Find wxWidgets needed for driver and bindings - if(PLD_wxwidgets) -@@ -39,11 +41,21 @@ - endif(PLD_wxwidgets) - - if(PLD_wxwidgets) -+ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") -+ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") - string(REGEX REPLACE ";" " -I" - wxwidgets_COMPILE_FLAGS -- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" -+ "-I${wxWidgets_INCLUDE_DIRS}" - ) -- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) -+ # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) -+ # when wxWidgets_DEFINITIONS is a list. -+ string(REGEX REPLACE ";" " " -+ wxwidgets_COMPILE_FLAGS -+ ${wxwidgets_COMPILE_FLAGS} -+ " ${wxWidgets_DEFINITIONS}" -+ ) -+ # Convert wxWidgets_LIBRARIES to full pathname form. -+ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") - if(WITH_FREETYPE) - set( - wxwidgets_COMPILE_FLAGS -diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake ---- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 -@@ -30,12 +30,7 @@ - if(PLD_xwin) - if(X11_FOUND) - set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") -- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not -- # documented for external use so we may have to replace this -- # some day by the appropriate -- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. -- # But this works for now.... -- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") -+ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") - option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) - if(HAVE_PTHREAD) - find_package(Threads) -diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt ---- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 -+++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 -@@ -21,6 +21,12 @@ - - # Version 2.4.5 or above of cmake is required! - CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) -+# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if -+# the user is using CMake 2.6.0 or newer). -+if(COMMAND cmake_policy) -+ # empty elements are not ignored in lists. -+ cmake_policy(SET CMP0007 NEW) -+endif(COMMAND cmake_policy) - - # Recommended way to do user overrides of C-related variables, is given at - # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. -diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt ---- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 -+++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 -@@ -50,32 +50,43 @@ - - if(BUILD_TEST) - remove_definitions("-DHAVE_CONFIG_H") -- # N.B. This is required because it's the location of plplot.mod -- # generated as a by-product of building libplplotf95${LIB_TAG}. -- include_directories(${CMAKE_BINARY_DIR}) - -- # Temporary workaround for module handling bug in CMake 2.4.3. Create a -- # file with arbitrary contents called plplot.mod.proxy in top-level -- # build tree. As a temporary measure we use cmake_workaround.f as the -- # generator of this file. (cmake_workaround.f was previously compiled, -- # but that is no longer the case.) Note, once CMake is fixed this comment -- # the following configure_file command and cmake_workaround.f should all -- # just disappear. -- configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -- ${CMAKE_BINARY_DIR}/plplot.mod.proxy -- COPYONLY -- ) -+ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Temporary workaround for module handling bug in CMake 2.4.3. Create a -+ # file with arbitrary contents called plplot.mod.proxy in top-level -+ # build tree. As a temporary measure we use cmake_workaround.f as the -+ # generator of this file. (cmake_workaround.f was previously compiled, -+ # but that is no longer the case.) Note, once CMake is fixed this comment -+ # the following configure_file command and cmake_workaround.f should all -+ # just disappear. -+ configure_file( -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -+ ${CMAKE_BINARY_DIR}/plplot.mod.proxy -+ COPYONLY -+ ) -+ # The generated module location for 2.4.x CMake is the top-level build -+ # tree. -+ include_directories(${CMAKE_BINARY_DIR}) -+ else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # The generated module location for cvs CMake is the build-tree -+ # location where the corresponding library is generated. -+ include_directories(${CMAKE_BINARY_DIR}/bindings/f95) -+ endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - endif(BUILD_TEST) - foreach(STRING_INDEX ${f95_STRING_INDICES}) - set(f95_SRCS ${f95_SRCS} x${STRING_INDEX}f.f90) - if(BUILD_TEST) -- add_executable(x${STRING_INDEX}f x${STRING_INDEX}f.f90) -- target_link_libraries(x${STRING_INDEX}f plplotf95${LIB_TAG}) -+ # Need unique target name -+ add_executable(x${STRING_INDEX}f95 x${STRING_INDEX}f.f90) -+ set_target_properties( -+ x${STRING_INDEX}f95 PROPERTIES -+ OUTPUT_NAME x${STRING_INDEX}f -+ ) -+ target_link_libraries(x${STRING_INDEX}f95 plplotf95${LIB_TAG}) - endif(BUILD_TEST) - endforeach(STRING_INDEX ${f95_STRING_INDICES}) - --install(FILES ${f95_SRCS} -+install(FILES ${f95_SRCS} - DESTINATION ${DATA_DIR}/examples/f95 - ) - Deleted: branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.dpatch =================================================================== --- branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.dpatch 2010-01-21 21:11:45 UTC (rev 10764) +++ branches/v5_9_5_debian/debian/patches/12_cmake-2.6-fixes.dpatch 2010-01-22 21:46:11 UTC (rev 10765) @@ -1,364 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_cmake-2.6-fixes.dpatch by <and...@us...> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the build system to work with cmake 2.6. -## DP: This patch is extracted from the upstream SVN version of plplot. - -@DPATCH@ - -diff -ur plplot-5.9.0-orig/bindings/f95/CMakeLists.txt plplot-5.9.0/bindings/f95/CMakeLists.txt ---- plplot-5.9.0-orig/bindings/f95/CMakeLists.txt 2008-02-10 15:54:01.000000000 +0000 -+++ plplot-5.9.0/bindings/f95/CMakeLists.txt 2008-07-16 10:53:26.000000000 +0100 -@@ -141,14 +141,30 @@ - RUNTIME DESTINATION ${BIN_DIR} - ) - --# Yuk! All Makefiles are run from the top level build directory and --# so the f90 .mod files end up there rather than in the bindings/f95 --# directory. Ifort and pgf90 both have a -module command line option to --# override this location, but I'm not sure how portable that? --install( --FILES ${CMAKE_BINARY_DIR}/plplot.mod ${CMAKE_BINARY_DIR}/plplotp.mod ${CMAKE_BINARY_DIR}/plplot_flt.mod --DESTINATION ${F95_MOD_DIR} --) -+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Yuk! All Makefiles are run from the top level build directory and -+ # so the f90 .mod files end up there rather than in the bindings/f95 -+ # directory. Ifort and pgf90 both have a -module command line option to -+ # override this location, but I'm not sure how portable that? -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/plplot.mod -+ ${CMAKE_BINARY_DIR}/plplotp.mod -+ ${CMAKE_BINARY_DIR}/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # For the current cvs version of CMake, the module files are created by -+ # default during the library build in the more logical bindings/f95 -+ # directory. -+ install( -+ FILES -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplotp.mod -+ ${CMAKE_BINARY_DIR}/bindings/f95/plplot_flt.mod -+ DESTINATION ${F95_MOD_DIR} -+ ) -+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) - - # Configure pkg-config *.pc file corresponding to libplplotf95${LIB_TAG} - if(PKG_CONFIG_EXECUTABLE) -diff -ur plplot-5.9.0-orig/cmake/modules/cairo.cmake plplot-5.9.0/cmake/modules/cairo.cmake ---- plplot-5.9.0-orig/cmake/modules/cairo.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/cairo.cmake 2008-07-15 16:25:46.000000000 +0100 -@@ -97,13 +97,7 @@ - string(REGEX REPLACE ";" " " - cairo_COMPILE_FLAGS "${cflags} ${X11_COMPILE_FLAGS}" - ) -- # Convert X linker information to preferred CMake form before appending -- # it to already converted ${linkflags} -- cmake_link_flags( -- cairo_X_LINK_FLAGS -- "-L${X11_LIBRARY_DIR};${X11_LIBRARIES}" -- ) -- set(cairo_LINK_FLAGS ${linkflags} ${cairo_X_LINK_FLAGS}) -+ set(cairo_LINK_FLAGS ${linkflags} ${X11_LIBRARIES}) - else(PLD_xcairo AND X11_COMPILE_FLAGS) - message(STATUS - "WARNING: X windows not found. Setting xcairo driver to OFF." -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaCompiler.cmake.in 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaCompiler.cmake.in 2008-07-15 15:47:30.000000000 +0100 -@@ -14,3 +14,4 @@ - ELSE(UNIX OR MINGW) - SET(CMAKE_Ada_OUTPUT_EXTENSION .obj) - ENDIF(UNIX OR MINGW) -+SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeAdaInformation.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeAdaInformation.cmake 2008-07-15 15:47:54.000000000 +0100 -@@ -41,9 +41,9 @@ - SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS) - --IF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) --ENDIF(NOT CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS) - - IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG) - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) -@@ -53,6 +53,10 @@ - SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) -+ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG) -+ - # repeat for modules - IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS) - SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) -@@ -70,6 +74,22 @@ - SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) - ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP) - -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG) -+ -+IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP}) -+ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP) -+ -+IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG}) -+ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG) -+ -+IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) -+ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH) -+ - IF(NOT CMAKE_INCLUDE_FLAG_Ada) - SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C}) - ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada) -@@ -85,7 +105,12 @@ - - SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") - --SET (CMAKE_Ada_FLAGS "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}" CACHE STRING -+SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}") -+# avoid just having a space as the initial value for the cache -+IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+ SET(CMAKE_Ada_FLAGS_INIT) -+ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ") -+SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING - "Flags for Ada compiler.") - - INCLUDE(CMakeCommonLanguageInclude) -diff -ur plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake ---- plplot-5.9.0-orig/cmake/modules/CMakeTestAdaCompiler.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/CMakeTestAdaCompiler.cmake 2008-07-15 15:48:05.000000000 +0100 -@@ -17,6 +17,8 @@ - - FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt - " -+# FIXME: This specific location currently needs to be changed whenever the -+# location of the experimental Ada support files is changed. - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE) - project(test Ada) -diff -ur plplot-5.9.0-orig/cmake/modules/pkg-config.cmake plplot-5.9.0/cmake/modules/pkg-config.cmake ---- plplot-5.9.0-orig/cmake/modules/pkg-config.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/pkg-config.cmake 2008-07-15 16:27:07.000000000 +0100 -@@ -20,10 +20,10 @@ - # Module for determining pkg-config configuration variables related to the - # install-tree build of the examples. - # Also create useful macros called pkg_check_pkgconfig to emulate the --# pkgconfig macro using the pkg_check_modules macro, --# cmake_to_pkg_config_link_flags to process CMake link flags into -+# pkgconfig macro using the pkg_check_modules macro; -+# pkg_config_link_flags to process CMake link flags into - # pkg-config standard form for the configured output *.pc files, and --# pkg_config_to_cmake_link_flags to process input link flags delivered -+# cmake_link_flags to process input link flags delivered - # by pkg-config into CMake standard form. - - # The following variables are set: -@@ -155,8 +155,10 @@ - set(${_link_flags_out}) - else("${_link_flags_in}" STREQUAL ""}) - #message("(original link flags) = ${_link_flags_in}") -- # Convert link flags to a list. -- string(REGEX REPLACE " " ";" _link_flags_list "${_link_flags_in}") -+ # Convert link flags to a list. Note some link flags are blank-delimited -+ # (such as "-framework whatever") so preserve those by splitting into -+ # separate list elements only if the next element starts with a hyphen. -+ string(REGEX REPLACE " -" ";-" _link_flags_list "${_link_flags_in}") - # Extract list of directories from -L options. - list(LENGTH _link_flags_list _link_flags_length) - math(EXPR _link_flags_length "${_link_flags_length} - 1") -@@ -164,7 +166,7 @@ - set(_link_directory_list) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-L" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-L" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-L${_list_element1}") - list(APPEND _index_list ${_list_index}) - list(APPEND _link_directory_list ${_list_element1}) -@@ -186,7 +188,7 @@ - set(${_link_flags_out}) - foreach(_list_index RANGE ${_link_flags_length}) - list(GET _link_flags_list ${_list_index} _list_element) -- string(REGEX REPLACE "^-l" "" _list_element1 ${_list_element}) -+ string(REGEX REPLACE "^-l" "" _list_element1 "${_list_element}") - if(_list_element STREQUAL "-l${_list_element1}") - set(_library_pathname "_library_pathname-NOTFOUND") - find_library( -diff -ur plplot-5.9.0-orig/cmake/modules/tcl-related.cmake plplot-5.9.0/cmake/modules/tcl-related.cmake ---- plplot-5.9.0-orig/cmake/modules/tcl-related.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/tcl-related.cmake 2008-07-15 16:55:58.000000000 +0100 -@@ -135,12 +135,7 @@ - endif(ENABLE_tk AND NOT X11_FOUND) - if(ENABLE_tk) - set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) -- set( -- TK_LIBRARY -- ${TK_LIBRARY} -- -L${X11_LIBRARY_DIR} -- ${X11_LIBRARIES} -- ) -+ set(TK_LIBRARY ${TK_LIBRARY} ${X11_LIBRARIES}) - message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") - message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") - else(ENABLE_tk) -@@ -157,7 +152,7 @@ - message(STATUS "Looking for itk library") - set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) - foreach(version ${itk_library_versions}) -- find_library(ITK_LIBRARY itk${version} ${TK_LIBRARY} -+ find_library(ITK_LIBRARY itk${version} - PATH_SUFFIXES itk${version}) - endforeach(version ${itk_library_versions}) - if(ITK_LIBRARY) -diff -ur plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake plplot-5.9.0/cmake/modules/wxwidgets.cmake ---- plplot-5.9.0-orig/cmake/modules/wxwidgets.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/wxwidgets.cmake 2008-07-15 16:31:27.000000000 +0100 -@@ -23,8 +23,10 @@ - # PLD_wxwidgets - ON means the wxwidgets device is enabled. - # wxwidgets_COMPILE_FLAGS - individual COMPILE_FLAGS required to compile wxwidgets - # device. --# wxwidgets_LINK_FLAGS - individual LINK_FLAGS for dynamic wxwidgets device. --# DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. -+# wxwidgets_LINK_FLAGS - list of full path names of libraries and -+# linker flags for dynamic wxwidgets device driver. -+# DRIVERS_LINK_FLAGS - list of device LINK_FLAGS for case -+# when ENABLE_DYNDRIVERS OFF. - - # Find wxWidgets needed for driver and bindings - if(PLD_wxwidgets) -@@ -39,11 +41,21 @@ - endif(PLD_wxwidgets) - - if(PLD_wxwidgets) -+ #message("wxWidgets_INCLUDE_DIRS = ${wxWidgets_INCLUDE_DIRS}") -+ #message("wxWidgets_DEFINITIONS = ${wxWidgets_DEFINITIONS}") - string(REGEX REPLACE ";" " -I" - wxwidgets_COMPILE_FLAGS -- "-I${wxWidgets_INCLUDE_DIRS} ${wxWidgets_DEFINITIONS}" -+ "-I${wxWidgets_INCLUDE_DIRS}" - ) -- set(wxwidgets_LINK_FLAGS ${wxWidgets_LIBRARIES}) -+ # For case (cvs version of CMake as of 2008-03-23, but not cmake-2.4.8) -+ # when wxWidgets_DEFINITIONS is a list. -+ string(REGEX REPLACE ";" " " -+ wxwidgets_COMPILE_FLAGS -+ ${wxwidgets_COMPILE_FLAGS} -+ " ${wxWidgets_DEFINITIONS}" -+ ) -+ # Convert wxWidgets_LIBRARIES to full pathname form. -+ cmake_link_flags(wxwidgets_LINK_FLAGS "${wxWidgets_LIBRARIES}") - if(WITH_FREETYPE) - set( - wxwidgets_COMPILE_FLAGS -diff -ur plplot-5.9.0-orig/cmake/modules/xwin.cmake plplot-5.9.0/cmake/modules/xwin.cmake ---- plplot-5.9.0-orig/cmake/modules/xwin.cmake 2008-02-10 15:53:59.000000000 +0000 -+++ plplot-5.9.0/cmake/modules/xwin.cmake 2008-07-15 16:31:23.000000000 +0100 -@@ -30,12 +30,7 @@ - if(PLD_xwin) - if(X11_FOUND) - set(xwin_COMPILE_FLAGS "${X11_COMPILE_FLAGS}") -- # N.B. X11_LIBRARY_DIR is used internally by FindX11.cmake but not -- # documented for external use so we may have to replace this -- # some day by the appropriate -- # "GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ??? PATH)" logic. -- # But this works for now.... -- set(xwin_LINK_FLAGS "-L${X11_LIBRARY_DIR} ${X11_LIBRARIES}") -+ set(xwin_LINK_FLAGS "${X11_LIBRARIES}") - option(HAVE_PTHREAD "Use pthreads with the xwin driver" OFF) - if(HAVE_PTHREAD) - find_package(Threads) -diff -ur plplot-5.9.0-orig/CMakeLists.txt plplot-5.9.0/CMakeLists.txt ---- plplot-5.9.0-orig/CMakeLists.txt 2008-02-10 15:54:06.000000000 +0000 -+++ plplot-5.9.0/CMakeLists.txt 2008-07-15 16:06:05.000000000 +0100 -@@ -21,6 +21,12 @@ - - # Version 2.4.5 or above of cmake is required! - CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR) -+# set CMake 2.6.x policy if the cmake_policy command exists, (i.e., if -+# the user is using CMake 2.6.0 or newer). -+if(COMMAND cmake_policy) -+ # empty elements are not ignored in lists. -+ cmake_policy(SET CMP0007 NEW) -+endif(COMMAND cmake_policy) - - # Recommended way to do user overrides of C-related variables, is given at - # http://public.kitware.com/pipermail/cmake/2006-July/010334.html. -diff -ur plplot-5.9.0-orig/examples/f95/CMakeLists.txt plplot-5.9.0/examples/f95/CMakeLists.txt ---- plplot-5.9.0-orig/examples/f95/CMakeLists.txt 2008-02-10 15:54:08.000000000 +0000 -+++ plplot-5.9.0/examples/f95/CMakeLists.txt 2008-07-15 16:04:44.000000000 +0100 -@@ -50,32 +50,43 @@ - - if(BUILD_TEST) - remove_definitions("-DHAVE_CONFIG_H") -- # N.B. This is required because it's the location of plplot.mod -- # generated as a by-product of building libplplotf95${LIB_TAG}. -- include_directories(${CMAKE_BINARY_DIR}) - -- # Temporary workaround for module handling bug in CMake 2.4.3. Create a -- # file with arbitrary contents called plplot.mod.proxy in top-level -- # build tree. As a temporary measure we use cmake_workaround.f as the -- # generator of this file. (cmake_workaround.f was previously compiled, -- # but that is no longer the case.) Note, once CMake is fixed this comment -- # the following configure_file command and cmake_workaround.f should all -- # just disappear. -- configure_file( -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -- ${CMAKE_BINARY_DIR}/plplot.mod.proxy -- COPYONLY -- ) -+ if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4) -+ # Temporary workaround for module handling bug in CMake 2.4.3. Create a -+ # file with arbitrary contents called plplot.mod.proxy in top-level -+ # build tree. As a temporary measure we use cmake_workaround.f as the -+ # generator of this file. (cmake_workaround.f was previously compiled, -+ # but that is no longer the case.) Note, once CMake is fixed this comment -+ # the following configure_file command and cmake_workaround.f should all -+ # just disappear. -+ configure_file( -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake_workaround.f -+ ${CMAKE_BINARY_DIR}/plplot.mod.proxy -+ COPYONLY -+ ) -+ # The generated module location for 2.4.x CMake is the top-level build -+ # tree. -+ include_directories(${CMAKE_BINARY_DIR}) -+ ... [truncated message content] |
From: <and...@us...> - 2010-01-25 20:56:16
|
Revision: 10767 http://plplot.svn.sourceforge.net/plplot/?rev=10767&view=rev Author: andrewross Date: 2010-01-25 20:56:07 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Addin FindwxWidgets.cmake from cmake 2.8.0 to cmake/modules (as is done upstream) to allow building with cmake 2.6.3. Change build-depends version accordingly. This means the packages will build with Ubuntu Karmic as well as Debian testing. Modified Paths: -------------- branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-01-25 20:21:19 UTC (rev 10766) +++ branches/v5_9_5_debian/debian/control.in 2010-01-25 20:56:07 UTC (rev 10767) @@ -4,7 +4,7 @@ Maintainer: Andrew Ross <and...@us...> Uploaders: Rafael Laboissiere <ra...@de...> Standards-Version: 3.8.3 -Build-Depends: cmake (>= 2.8.0), debhelper (>= 7), +Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), Modified: branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff 2010-01-25 20:21:19 UTC (rev 10766) +++ branches/v5_9_5_debian/debian/patches/16_wxwidget-with-cmake-2.8.diff 2010-01-25 20:56:07 UTC (rev 10767) @@ -69,3 +69,1027 @@ ) STRING(REGEX REPLACE ";" " -I" wxWidgets_IFLAGS +diff -urN plplot-5.9.2.orig/cmake/modules/FindwxWidgets.cmake plplot-5.9.2/cmake/modules/FindwxWidgets.cmake +--- plplot-5.9.2.orig/cmake/modules/FindwxWidgets.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ plplot-5.9.2/cmake/modules/FindwxWidgets.cmake 2009-11-11 12:29:53.000000000 +0000 +@@ -0,0 +1,1020 @@ ++# - Find a wxWidgets (a.k.a., wxWindows) installation. ++# This module finds if wxWidgets is installed and selects a default ++# configuration to use. wxWidgets is a modular library. To specify the ++# modules that you will use, you need to name them as components to ++# the package: ++# ++# FIND_PACKAGE(wxWidgets COMPONENTS base core ...) ++# ++# There are two search branches: a windows style and a unix style. For ++# windows, the following variables are searched for and set to ++# defaults in case of multiple choices. Change them if the defaults ++# are not desired (i.e., these are the only variables you should ++# change to select a configuration): ++# ++# wxWidgets_ROOT_DIR - Base wxWidgets directory ++# (e.g., C:/wxWidgets-2.6.3). ++# wxWidgets_LIB_DIR - Path to wxWidgets libraries ++# (e.g., C:/wxWidgets-2.6.3/lib/vc_lib). ++# wxWidgets_CONFIGURATION - Configuration to use ++# (e.g., msw, mswd, mswu, mswunivud, etc.) ++# ++# For unix style it uses the wx-config utility. You can select between ++# debug/release, unicode/ansi, universal/non-universal, and ++# static/shared in the QtDialog or ccmake interfaces by turning ON/OFF ++# the following variables: ++# ++# wxWidgets_USE_DEBUG ++# wxWidgets_USE_UNICODE ++# wxWidgets_USE_UNIVERSAL ++# wxWidgets_USE_STATIC ++# ++# The following are set after the configuration is done for both ++# windows and unix style: ++# ++# wxWidgets_FOUND - Set to TRUE if wxWidgets was found. ++# wxWidgets_INCLUDE_DIRS - Include directories for WIN32 ++# i.e., where to find "wx/wx.h" and ++# "wx/setup.h"; possibly empty for unices. ++# wxWidgets_LIBRARIES - Path to the wxWidgets libraries. ++# wxWidgets_LIBRARY_DIRS - compile time link dirs, useful for ++# rpath on UNIX. Typically an empty string ++# in WIN32 environment. ++# wxWidgets_DEFINITIONS - Contains defines required to compile/link ++# against WX, e.g. WXUSINGDLL ++# wxWidgets_DEFINITIONS_DEBUG- Contains defines required to compile/link ++# against WX debug builds, e.g. __WXDEBUG__ ++# wxWidgets_CXX_FLAGS - Include dirs and compiler flags for ++# unices, empty on WIN32. Essentially ++# "`wx-config --cxxflags`". ++# wxWidgets_USE_FILE - Convenience include file. ++# ++# Sample usage: ++# FIND_PACKAGE(wxWidgets COMPONENTS base core gl net) ++# IF(wxWidgets_FOUND) ++# INCLUDE(${wxWidgets_USE_FILE}) ++# # and for each of your dependant executable/library targets: ++# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES}) ++# ENDIF(wxWidgets_FOUND) ++# ++# If wxWidgets is required (i.e., not an optional part): ++# FIND_PACKAGE(wxWidgets REQUIRED base core gl net) ++# INCLUDE(${wxWidgets_USE_FILE}) ++# # and for each of your dependant executable/library targets: ++# TARGET_LINK_LIBRARIES(<YourTarget> ${wxWidgets_LIBRARIES}) ++ ++#============================================================================= ++# Copyright 2004-2009 Kitware, Inc. ++# Copyright 2007-2009 Miguel A. Figueroa-Villanueva <miguelf at ieee dot org> ++# ++# Distributed under the OSI-approved BSD License (the "License"); ++# see accompanying file Copyright.txt for details. ++# ++# This software is distributed WITHOUT ANY WARRANTY; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# See the License for more information. ++#============================================================================= ++# (To distributed this file outside of CMake, substitute the full ++# License text for the above reference.) ++ ++# ++# FIXME: check this and provide a correct sample usage... ++# Remember to connect back to the upper text. ++# Sample usage with monolithic wx build: ++# ++# FIND_PACKAGE(wxWidgets COMPONENTS mono) ++# ... ++ ++# NOTES ++# ++# This module has been tested on the WIN32 platform with wxWidgets ++# 2.6.2, 2.6.3, and 2.5.3. However, it has been designed to ++# easily extend support to all possible builds, e.g., static/shared, ++# debug/release, unicode, universal, multilib/monolithic, etc.. ++# ++# If you want to use the module and your build type is not supported ++# out-of-the-box, please contact me to exchange information on how ++# your system is setup and I'll try to add support for it. ++# ++# AUTHOR ++# ++# Miguel A. Figueroa-Villanueva (miguelf at ieee dot org). ++# Jan Woetzel (jw at mip.informatik.uni-kiel.de). ++# ++# Based on previous works of: ++# Jan Woetzel (FindwxWindows.cmake), ++# Jorgen Bodde and Jerry Fath (FindwxWin.cmake). ++ ++# TODO/ideas ++# ++# (1) Option/Setting to use all available wx libs ++# In contrast to expert developer who lists the ++# minimal set of required libs in wxWidgets_USE_LIBS ++# there is the newbie user: ++# - who just wants to link against WX with more 'magic' ++# - doesn't know the internal structure of WX or how it was built, ++# in particular if it is monolithic or not ++# - want to link against all available WX libs ++# Basically, the intent here is to mimic what wx-config would do by ++# default (i.e., `wx-config --libs`). ++# ++# Possible solution: ++# Add a reserved keyword "std" that initializes to what wx-config ++# would default to. If the user has not set the wxWidgets_USE_LIBS, ++# default to "std" instead of "base core" as it is now. To implement ++# "std" will basically boil down to a FOR_EACH lib-FOUND, but maybe ++# checking whether a minimal set was found. ++ ++ ++# FIXME: This and all the DBG_MSG calls should be removed after the ++# module stabilizes. ++# ++# Helper macro to control the debugging output globally. There are ++# two versions for controlling how verbose your output should be. ++MACRO(DBG_MSG _MSG) ++# MESSAGE(STATUS ++# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") ++ENDMACRO(DBG_MSG) ++MACRO(DBG_MSG_V _MSG) ++# MESSAGE(STATUS ++# "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): ${_MSG}") ++ENDMACRO(DBG_MSG_V) ++ ++# Clear return values in case the module is loaded more than once. ++SET(wxWidgets_FOUND FALSE) ++SET(wxWidgets_INCLUDE_DIRS "") ++SET(wxWidgets_LIBRARIES "") ++SET(wxWidgets_LIBRARY_DIRS "") ++SET(wxWidgets_CXX_FLAGS "") ++ ++# Using SYSTEM with INCLUDE_DIRECTORIES in conjunction with wxWidgets on ++# the Mac produces compiler errors. Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM ++# to prevent UsewxWidgets.cmake from using SYSTEM. ++# ++# See cmake mailing list discussions for more info: ++# http://www.cmake.org/pipermail/cmake/2008-April/021115.html ++# http://www.cmake.org/pipermail/cmake/2008-April/021146.html ++# ++IF(APPLE) ++ SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1) ++ENDIF(APPLE) ++ ++# DEPRECATED: This is a patch to support the DEPRECATED use of ++# wxWidgets_USE_LIBS. ++# ++# If wxWidgets_USE_LIBS is set: ++# - if using <components>, then override wxWidgets_USE_LIBS ++# - else set wxWidgets_FIND_COMPONENTS to wxWidgets_USE_LIBS ++IF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS) ++ SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_USE_LIBS}) ++ENDIF(wxWidgets_USE_LIBS AND NOT wxWidgets_FIND_COMPONENTS) ++DBG_MSG("wxWidgets_FIND_COMPONENTS : ${wxWidgets_FIND_COMPONENTS}") ++ ++# Add the convenience use file if available. ++# ++# Get dir of this file which may reside in: ++# - CMAKE_MAKE_ROOT/Modules on CMake installation ++# - CMAKE_MODULE_PATH if user prefers his own specialized version ++SET(wxWidgets_USE_FILE "") ++GET_FILENAME_COMPONENT( ++ wxWidgets_CURRENT_LIST_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) ++# Prefer an existing customized version, but the user might override ++# the FindwxWidgets module and not the UsewxWidgets one. ++IF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") ++ SET(wxWidgets_USE_FILE ++ "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") ++ELSE(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") ++ SET(wxWidgets_USE_FILE UsewxWidgets.cmake) ++ENDIF(EXISTS "${wxWidgets_CURRENT_LIST_DIR}/UsewxWidgets.cmake") ++ ++#===================================================================== ++#===================================================================== ++IF(WIN32 AND NOT CYGWIN AND NOT MSYS) ++ SET(wxWidgets_FIND_STYLE "win32") ++ELSE(WIN32 AND NOT CYGWIN AND NOT MSYS) ++ IF(UNIX OR MSYS) ++ SET(wxWidgets_FIND_STYLE "unix") ++ ENDIF(UNIX OR MSYS) ++ENDIF(WIN32 AND NOT CYGWIN AND NOT MSYS) ++ ++#===================================================================== ++# WIN32_FIND_STYLE ++#===================================================================== ++IF(wxWidgets_FIND_STYLE STREQUAL "win32") ++ # Useful common wx libs needed by almost all components. ++ SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat) ++ ++ # DEPRECATED: Use FIND_PACKAGE(wxWidgets COMPONENTS mono) instead. ++ IF(NOT wxWidgets_FIND_COMPONENTS) ++ IF(wxWidgets_USE_MONOLITHIC) ++ SET(wxWidgets_FIND_COMPONENTS mono) ++ ELSE(wxWidgets_USE_MONOLITHIC) ++ SET(wxWidgets_FIND_COMPONENTS base core) # this is default ++ ENDIF(wxWidgets_USE_MONOLITHIC) ++ ENDIF(NOT wxWidgets_FIND_COMPONENTS) ++ ++ # Always add the common required libs. ++ LIST(APPEND wxWidgets_FIND_COMPONENTS ${wxWidgets_COMMON_LIBRARIES}) ++ ++ #------------------------------------------------------------------- ++ # WIN32: Helper MACROS ++ #------------------------------------------------------------------- ++ # ++ # Get filename components for a configuration. For example, ++ # if _CONFIGURATION = mswunivud, then _UNV=univ, _UCD=u _DBG=d ++ # if _CONFIGURATION = mswu, then _UNV="", _UCD=u _DBG="" ++ # ++ MACRO(WX_GET_NAME_COMPONENTS _CONFIGURATION _UNV _UCD _DBG) ++ STRING(REGEX MATCH "univ" ${_UNV} "${_CONFIGURATION}") ++ STRING(REGEX REPLACE "msw.*(u)[d]*$" "u" ${_UCD} "${_CONFIGURATION}") ++ IF(${_UCD} STREQUAL ${_CONFIGURATION}) ++ SET(${_UCD} "") ++ ENDIF(${_UCD} STREQUAL ${_CONFIGURATION}) ++ STRING(REGEX MATCH "d$" ${_DBG} "${_CONFIGURATION}") ++ ENDMACRO(WX_GET_NAME_COMPONENTS) ++ ++ # ++ # Find libraries associated to a configuration. ++ # ++ MACRO(WX_FIND_LIBS _UNV _UCD _DBG) ++ DBG_MSG_V("m_unv = ${_UNV}") ++ DBG_MSG_V("m_ucd = ${_UCD}") ++ DBG_MSG_V("m_dbg = ${_DBG}") ++ ++ # FIXME: What if both regex libs are available. regex should be ++ # found outside the loop and only wx${LIB}${_UCD}${_DBG}. ++ # Find wxWidgets common libraries. ++ FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES}) ++ FIND_LIBRARY(WX_${LIB}${_DBG} ++ NAMES ++ wx${LIB}${_UCD}${_DBG} # for regex ++ wx${LIB}${_DBG} ++ PATHS ${WX_LIB_DIR} ++ NO_DEFAULT_PATH ++ ) ++ MARK_AS_ADVANCED(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ++ # Find wxWidgets multilib base libraries. ++ FIND_LIBRARY(WX_base${_DBG} ++ NAMES ++ wxbase29${_UCD}${_DBG} ++ wxbase28${_UCD}${_DBG} ++ wxbase27${_UCD}${_DBG} ++ wxbase26${_UCD}${_DBG} ++ wxbase25${_UCD}${_DBG} ++ PATHS ${WX_LIB_DIR} ++ NO_DEFAULT_PATH ++ ) ++ MARK_AS_ADVANCED(WX_base${_DBG}) ++ FOREACH(LIB net odbc xml) ++ FIND_LIBRARY(WX_${LIB}${_DBG} ++ NAMES ++ wxbase29${_UCD}${_DBG}_${LIB} ++ wxbase28${_UCD}${_DBG}_${LIB} ++ wxbase27${_UCD}${_DBG}_${LIB} ++ wxbase26${_UCD}${_DBG}_${LIB} ++ wxbase25${_UCD}${_DBG}_${LIB} ++ PATHS ${WX_LIB_DIR} ++ NO_DEFAULT_PATH ++ ) ++ MARK_AS_ADVANCED(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ++ # Find wxWidgets monolithic library. ++ FIND_LIBRARY(WX_mono${_DBG} ++ NAMES ++ wxmsw${_UNV}29${_UCD}${_DBG} ++ wxmsw${_UNV}28${_UCD}${_DBG} ++ wxmsw${_UNV}27${_UCD}${_DBG} ++ wxmsw${_UNV}26${_UCD}${_DBG} ++ wxmsw${_UNV}25${_UCD}${_DBG} ++ PATHS ${WX_LIB_DIR} ++ NO_DEFAULT_PATH ++ ) ++ MARK_AS_ADVANCED(WX_mono${_DBG}) ++ ++ # Find wxWidgets multilib libraries. ++ FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext) ++ FIND_LIBRARY(WX_${LIB}${_DBG} ++ NAMES ++ wxmsw${_UNV}29${_UCD}${_DBG}_${LIB} ++ wxmsw${_UNV}28${_UCD}${_DBG}_${LIB} ++ wxmsw${_UNV}27${_UCD}${_DBG}_${LIB} ++ wxmsw${_UNV}26${_UCD}${_DBG}_${LIB} ++ wxmsw${_UNV}25${_UCD}${_DBG}_${LIB} ++ PATHS ${WX_LIB_DIR} ++ NO_DEFAULT_PATH ++ ) ++ MARK_AS_ADVANCED(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ENDMACRO(WX_FIND_LIBS) ++ ++ # ++ # Clear all library paths, so that FIND_LIBRARY refinds them. ++ # ++ # Clear a lib, reset its found flag, and mark as advanced. ++ MACRO(WX_CLEAR_LIB _LIB) ++ SET(${_LIB} "${_LIB}-NOTFOUND" CACHE FILEPATH "Cleared." FORCE) ++ SET(${_LIB}_FOUND FALSE) ++ MARK_AS_ADVANCED(${_LIB}) ++ ENDMACRO(WX_CLEAR_LIB) ++ # Clear all debug or release library paths (arguments are "d" or ""). ++ MACRO(WX_CLEAR_ALL_LIBS _DBG) ++ # Clear wxWidgets common libraries. ++ FOREACH(LIB ${wxWidgets_COMMON_LIBRARIES}) ++ WX_CLEAR_LIB(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ++ # Clear wxWidgets multilib base libraries. ++ WX_CLEAR_LIB(WX_base${_DBG}) ++ FOREACH(LIB net odbc xml) ++ WX_CLEAR_LIB(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ++ # Clear wxWidgets monolithic library. ++ WX_CLEAR_LIB(WX_mono${_DBG}) ++ ++ # Clear wxWidgets multilib libraries. ++ FOREACH(LIB core adv aui html media xrc dbgrid gl qa richtext) ++ WX_CLEAR_LIB(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ENDMACRO(WX_CLEAR_ALL_LIBS) ++ # Clear all wxWidgets debug libraries. ++ MACRO(WX_CLEAR_ALL_DBG_LIBS) ++ WX_CLEAR_ALL_LIBS("d") ++ ENDMACRO(WX_CLEAR_ALL_DBG_LIBS) ++ # Clear all wxWidgets release libraries. ++ MACRO(WX_CLEAR_ALL_REL_LIBS) ++ WX_CLEAR_ALL_LIBS("") ++ ENDMACRO(WX_CLEAR_ALL_REL_LIBS) ++ ++ # ++ # Set the wxWidgets_LIBRARIES variable. ++ # Also, Sets output variable wxWidgets_FOUND to FALSE if it fails. ++ # ++ MACRO(WX_SET_LIBRARIES _LIBS _DBG) ++ DBG_MSG_V("Looking for ${${_LIBS}}") ++ IF(WX_USE_REL_AND_DBG) ++ FOREACH(LIB ${${_LIBS}}) ++ DBG_MSG_V("Searching for ${LIB} and ${LIB}d") ++ DBG_MSG_V("WX_${LIB} : ${WX_${LIB}}") ++ DBG_MSG_V("WX_${LIB}d : ${WX_${LIB}d}") ++ IF(WX_${LIB} AND WX_${LIB}d) ++ DBG_MSG_V("Found ${LIB} and ${LIB}d") ++ LIST(APPEND wxWidgets_LIBRARIES ++ debug ${WX_${LIB}d} optimized ${WX_${LIB}} ++ ) ++ ELSE(WX_${LIB} AND WX_${LIB}d) ++ DBG_MSG_V("- not found due to missing WX_${LIB}=${WX_${LIB}} or WX_${LIB}d=${WX_${LIB}d}") ++ SET(wxWidgets_FOUND FALSE) ++ ENDIF(WX_${LIB} AND WX_${LIB}d) ++ ENDFOREACH(LIB) ++ ELSE(WX_USE_REL_AND_DBG) ++ FOREACH(LIB ${${_LIBS}}) ++ DBG_MSG_V("Searching for ${LIB}${_DBG}") ++ DBG_MSG_V("WX_${LIB}${_DBG} : ${WX_${LIB}${_DBG}}") ++ IF(WX_${LIB}${_DBG}) ++ DBG_MSG_V("Found ${LIB}${_DBG}") ++ LIST(APPEND wxWidgets_LIBRARIES ${WX_${LIB}${_DBG}}) ++ ELSE(WX_${LIB}${_DBG}) ++ DBG_MSG_V( ++ "- not found due to missing WX_${LIB}${_DBG}=${WX_${LIB}${_DBG}}") ++ SET(wxWidgets_FOUND FALSE) ++ ENDIF(WX_${LIB}${_DBG}) ++ ENDFOREACH(LIB) ++ ENDIF(WX_USE_REL_AND_DBG) ++ ++ DBG_MSG_V("OpenGL") ++ LIST(FIND ${_LIBS} gl WX_USE_GL) ++ IF(NOT WX_USE_GL EQUAL -1) ++ DBG_MSG_V("- is required.") ++ LIST(APPEND wxWidgets_LIBRARIES opengl32 glu32) ++ ENDIF(NOT WX_USE_GL EQUAL -1) ++ ++ LIST(APPEND wxWidgets_LIBRARIES winmm comctl32 rpcrt4 wsock32) ++ ENDMACRO(WX_SET_LIBRARIES) ++ ++ #------------------------------------------------------------------- ++ # WIN32: Start actual work. ++ #------------------------------------------------------------------- ++ ++ # Look for an installation tree. ++ FIND_PATH(wxWidgets_ROOT_DIR ++ NAMES include/wx/wx.h ++ PATHS ++ $ENV{wxWidgets_ROOT_DIR} ++ $ENV{WXWIN} ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\wxWidgets_is1;Inno Setup: App Path]" # WX 2.6.x ++ C:/ ++ D:/ ++ $ENV{ProgramFiles} ++ PATH_SUFFIXES ++ wxWidgets-2.9.4 ++ wxWidgets-2.9.3 ++ wxWidgets-2.9.2 ++ wxWidgets-2.9.1 ++ wxWidgets-2.9.0 ++ wxWidgets-2.8.9 ++ wxWidgets-2.8.8 ++ wxWidgets-2.8.7 ++ wxWidgets-2.8.6 ++ wxWidgets-2.8.5 ++ wxWidgets-2.8.4 ++ wxWidgets-2.8.3 ++ wxWidgets-2.8.2 ++ wxWidgets-2.8.1 ++ wxWidgets-2.8.0 ++ wxWidgets-2.7.4 ++ wxWidgets-2.7.3 ++ wxWidgets-2.7.2 ++ wxWidgets-2.7.1 ++ wxWidgets-2.7.0 ++ wxWidgets-2.7.0-1 ++ wxWidgets-2.6.4 ++ wxWidgets-2.6.3 ++ wxWidgets-2.6.2 ++ wxWidgets-2.6.1 ++ wxWidgets-2.5.4 ++ wxWidgets-2.5.3 ++ wxWidgets-2.5.2 ++ wxWidgets-2.5.1 ++ wxWidgets ++ DOC "wxWidgets base/installation directory?" ++ ) ++ ++ # If wxWidgets_ROOT_DIR changed, clear lib dir. ++ IF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR) ++ SET(WX_ROOT_DIR ${wxWidgets_ROOT_DIR} ++ CACHE INTERNAL "wxWidgets_ROOT_DIR") ++ SET(wxWidgets_LIB_DIR "wxWidgets_LIB_DIR-NOTFOUND" ++ CACHE PATH "Cleared." FORCE) ++ ENDIF(NOT WX_ROOT_DIR STREQUAL wxWidgets_ROOT_DIR) ++ ++ IF(WX_ROOT_DIR) ++ # Select one default tree inside the already determined wx tree. ++ # Prefer static/shared order usually consistent with build ++ # settings. ++ IF(MINGW) ++ SET(WX_LIB_DIR_PREFIX gcc) ++ ELSE(MINGW) ++ SET(WX_LIB_DIR_PREFIX vc) ++ ENDIF(MINGW) ++ IF(BUILD_SHARED_LIBS) ++ FIND_PATH(wxWidgets_LIB_DIR ++ NAMES ++ msw/wx/setup.h ++ mswd/wx/setup.h ++ mswu/wx/setup.h ++ mswud/wx/setup.h ++ mswuniv/wx/setup.h ++ mswunivd/wx/setup.h ++ mswunivu/wx/setup.h ++ mswunivud/wx/setup.h ++ PATHS ++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll # prefer shared ++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib ++ DOC "Path to wxWidgets libraries?" ++ NO_DEFAULT_PATH ++ ) ++ ELSE(BUILD_SHARED_LIBS) ++ FIND_PATH(wxWidgets_LIB_DIR ++ NAMES ++ msw/wx/setup.h ++ mswd/wx/setup.h ++ mswu/wx/setup.h ++ mswud/wx/setup.h ++ mswuniv/wx/setup.h ++ mswunivd/wx/setup.h ++ mswunivu/wx/setup.h ++ mswunivud/wx/setup.h ++ PATHS ++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_lib # prefer static ++ ${WX_ROOT_DIR}/lib/${WX_LIB_DIR_PREFIX}_dll ++ DOC "Path to wxWidgets libraries?" ++ NO_DEFAULT_PATH ++ ) ++ ENDIF(BUILD_SHARED_LIBS) ++ ++ # If wxWidgets_LIB_DIR changed, clear all libraries. ++ IF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) ++ SET(WX_LIB_DIR ${wxWidgets_LIB_DIR} CACHE INTERNAL "wxWidgets_LIB_DIR") ++ WX_CLEAR_ALL_DBG_LIBS() ++ WX_CLEAR_ALL_REL_LIBS() ++ ENDIF(NOT WX_LIB_DIR STREQUAL wxWidgets_LIB_DIR) ++ ++ IF(WX_LIB_DIR) ++ # If building shared libs, define WXUSINGDLL to use dllimport. ++ IF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*") ++ SET(wxWidgets_DEFINITIONS WXUSINGDLL) ++ DBG_MSG_V("detected SHARED/DLL tree WX_LIB_DIR=${WX_LIB_DIR}") ++ ENDIF(WX_LIB_DIR MATCHES ".*[dD][lL][lL].*") ++ ++ # Search for available configuration types. ++ FOREACH(CFG mswunivud mswunivd mswud mswd mswunivu mswuniv mswu msw) ++ SET(WX_${CFG}_FOUND FALSE) ++ IF(EXISTS ${WX_LIB_DIR}/${CFG}) ++ LIST(APPEND WX_CONFIGURATION_LIST ${CFG}) ++ SET(WX_${CFG}_FOUND TRUE) ++ SET(WX_CONFIGURATION ${CFG}) ++ ENDIF(EXISTS ${WX_LIB_DIR}/${CFG}) ++ ENDFOREACH(CFG) ++ DBG_MSG_V("WX_CONFIGURATION_LIST=${WX_CONFIGURATION_LIST}") ++ ++ IF(WX_CONFIGURATION) ++ SET(wxWidgets_FOUND TRUE) ++ ++ # If the selected configuration wasn't found force the default ++ # one. Otherwise, use it but still force a refresh for ++ # updating the doc string with the current list of available ++ # configurations. ++ IF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND) ++ SET(wxWidgets_CONFIGURATION ${WX_CONFIGURATION} CACHE STRING ++ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) ++ ELSE(NOT WX_${wxWidgets_CONFIGURATION}_FOUND) ++ SET(wxWidgets_CONFIGURATION ${wxWidgets_CONFIGURATION} CACHE STRING ++ "Set wxWidgets configuration (${WX_CONFIGURATION_LIST})" FORCE) ++ ENDIF(NOT WX_${wxWidgets_CONFIGURATION}_FOUND) ++ ++ # If release config selected, and both release/debug exist. ++ IF(WX_${wxWidgets_CONFIGURATION}d_FOUND) ++ OPTION(wxWidgets_USE_REL_AND_DBG ++ "Use release and debug configurations?" TRUE) ++ SET(WX_USE_REL_AND_DBG ${wxWidgets_USE_REL_AND_DBG}) ++ ELSE(WX_${wxWidgets_CONFIGURATION}d_FOUND) ++ # If the option exists (already in cache), force it false. ++ IF(wxWidgets_USE_REL_AND_DBG) ++ SET(wxWidgets_USE_REL_AND_DBG FALSE CACHE BOOL ++ "No ${wxWidgets_CONFIGURATION}d found." FORCE) ++ ENDIF(wxWidgets_USE_REL_AND_DBG) ++ SET(WX_USE_REL_AND_DBG FALSE) ++ ENDIF(WX_${wxWidgets_CONFIGURATION}d_FOUND) ++ ++ # Get configuration parameters from the name. ++ WX_GET_NAME_COMPONENTS(${wxWidgets_CONFIGURATION} UNV UCD DBG) ++ ++ # Set wxWidgets main include directory. ++ IF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) ++ SET(wxWidgets_INCLUDE_DIRS ${WX_ROOT_DIR}/include) ++ ELSE(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) ++ DBG_MSG("wxWidgets_FOUND FALSE because WX_ROOT_DIR=${WX_ROOT_DIR} has no ${WX_ROOT_DIR}/include/wx/wx.h") ++ SET(wxWidgets_FOUND FALSE) ++ ENDIF(EXISTS ${WX_ROOT_DIR}/include/wx/wx.h) ++ ++ # Set wxWidgets lib setup include directory. ++ IF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) ++ LIST(APPEND wxWidgets_INCLUDE_DIRS ++ ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}) ++ ELSE(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) ++ DBG_MSG("WXWIDGET_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.") ++ SET(wxWidgets_FOUND FALSE) ++ ENDIF(EXISTS ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h) ++ ++ # Find wxWidgets libraries. ++ WX_FIND_LIBS("${UNV}" "${UCD}" "${DBG}") ++ IF(WX_USE_REL_AND_DBG) ++ WX_FIND_LIBS("${UNV}" "${UCD}" "d") ++ ENDIF(WX_USE_REL_AND_DBG) ++ ++ # Settings for requested libs (i.e., include dir, libraries, etc.). ++ WX_SET_LIBRARIES(wxWidgets_FIND_COMPONENTS "${DBG}") ++ ++ # Add necessary definitions for unicode builds ++ IF("${UCD}" STREQUAL "u") ++ LIST(APPEND wxWidgets_DEFINITIONS UNICODE _UNICODE) ++ ENDIF("${UCD}" STREQUAL "u") ++ ++ # Add necessary definitions for debug builds ++ SET(wxWidgets_DEFINITIONS_DEBUG _DEBUG __WXDEBUG__) ++ ++ ENDIF(WX_CONFIGURATION) ++ ENDIF(WX_LIB_DIR) ++ ENDIF(WX_ROOT_DIR) ++ ++#===================================================================== ++# UNIX_FIND_STYLE ++#===================================================================== ++ELSE(wxWidgets_FIND_STYLE STREQUAL "win32") ++ IF(wxWidgets_FIND_STYLE STREQUAL "unix") ++ #----------------------------------------------------------------- ++ # UNIX: Helper MACROS ++ #----------------------------------------------------------------- ++ # ++ # Set the default values based on "wx-config --selected-config". ++ # ++ MACRO(WX_CONFIG_SELECT_GET_DEFAULT) ++ EXECUTE_PROCESS( ++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --selected-config ++ OUTPUT_VARIABLE _wx_selected_config ++ RESULT_VARIABLE _wx_result ++ ERROR_QUIET ++ ) ++ IF(_wx_result EQUAL 0) ++ FOREACH(_opt_name debug static unicode universal) ++ STRING(TOUPPER ${_opt_name} _upper_opt_name) ++ IF(_wx_selected_config MATCHES ".*${_opt_name}.*") ++ SET(wxWidgets_DEFAULT_${_upper_opt_name} ON) ++ ELSE(_wx_selected_config MATCHES ".*${_opt_name}.*") ++ SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF) ++ ENDIF(_wx_selected_config MATCHES ".*${_opt_name}.*") ++ ENDFOREACH(_opt_name) ++ ELSE(_wx_result EQUAL 0) ++ FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL) ++ SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF) ++ ENDFOREACH(_upper_opt_name) ++ ENDIF(_wx_result EQUAL 0) ++ ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT) ++ ++ # ++ # Query a boolean configuration option to determine if the system ++ # has both builds available. If so, provide the selection option ++ # to the user. ++ # ++ MACRO(WX_CONFIG_SELECT_QUERY_BOOL _OPT_NAME _OPT_HELP) ++ EXECUTE_PROCESS( ++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=yes ++ RESULT_VARIABLE _wx_result_yes ++ OUTPUT_QUIET ++ ERROR_QUIET ++ ) ++ EXECUTE_PROCESS( ++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --${_OPT_NAME}=no ++ RESULT_VARIABLE _wx_result_no ++ OUTPUT_QUIET ++ ERROR_QUIET ++ ) ++ STRING(TOUPPER ${_OPT_NAME} _UPPER_OPT_NAME) ++ IF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0) ++ OPTION(wxWidgets_USE_${_UPPER_OPT_NAME} ++ ${_OPT_HELP} ${wxWidgets_DEFAULT_${_UPPER_OPT_NAME}}) ++ ELSE(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0) ++ # If option exists (already in cache), force to available one. ++ IF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME}) ++ IF(_wx_result_yes EQUAL 0) ++ SET(wxWidgets_USE_${_UPPER_OPT_NAME} ON CACHE BOOL ${_OPT_HELP} FORCE) ++ ELSE(_wx_result_yes EQUAL 0) ++ SET(wxWidgets_USE_${_UPPER_OPT_NAME} OFF CACHE BOOL ${_OPT_HELP} FORCE) ++ ENDIF(_wx_result_yes EQUAL 0) ++ ENDIF(DEFINED wxWidgets_USE_${_UPPER_OPT_NAME}) ++ ENDIF(_wx_result_yes EQUAL 0 AND _wx_result_no EQUAL 0) ++ ENDMACRO(WX_CONFIG_SELECT_QUERY_BOOL) ++ ++ # ++ # Set wxWidgets_SELECT_OPTIONS to wx-config options for selecting ++ # among multiple builds. ++ # ++ MACRO(WX_CONFIG_SELECT_SET_OPTIONS) ++ SET(wxWidgets_SELECT_OPTIONS "") ++ FOREACH(_opt_name debug static unicode universal) ++ STRING(TOUPPER ${_opt_name} _upper_opt_name) ++ IF(DEFINED wxWidgets_USE_${_upper_opt_name}) ++ IF(wxWidgets_USE_${_upper_opt_name}) ++ LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=yes) ++ ELSE(wxWidgets_USE_${_upper_opt_name}) ++ LIST(APPEND wxWidgets_SELECT_OPTIONS --${_opt_name}=no) ++ ENDIF(wxWidgets_USE_${_upper_opt_name}) ++ ENDIF(DEFINED wxWidgets_USE_${_upper_opt_name}) ++ ENDFOREACH(_opt_name) ++ ENDMACRO(WX_CONFIG_SELECT_SET_OPTIONS) ++ ++ #----------------------------------------------------------------- ++ # UNIX: Start actual work. ++ #----------------------------------------------------------------- ++ # Support cross-compiling, only search in the target platform. ++ FIND_PROGRAM(wxWidgets_CONFIG_EXECUTABLE wx-config ++ ONLY_CMAKE_FIND_ROOT_PATH ++ ) ++ ++ IF(wxWidgets_CONFIG_EXECUTABLE) ++ SET(wxWidgets_FOUND TRUE) ++ ++ # get defaults based on "wx-config --selected-config" ++ WX_CONFIG_SELECT_GET_DEFAULT() ++ ++ # for each option: if both builds are available, provide option ++ WX_CONFIG_SELECT_QUERY_BOOL(debug "Use debug build?") ++ WX_CONFIG_SELECT_QUERY_BOOL(unicode "Use unicode build?") ++ WX_CONFIG_SELECT_QUERY_BOOL(universal "Use universal build?") ++ WX_CONFIG_SELECT_QUERY_BOOL(static "Link libraries statically?") ++ ++ # process selection to set wxWidgets_SELECT_OPTIONS ++ WX_CONFIG_SELECT_SET_OPTIONS() ++ DBG_MSG("wxWidgets_SELECT_OPTIONS=${wxWidgets_SELECT_OPTIONS}") ++ ++ # run the wx-config program to get cxxflags ++ EXECUTE_PROCESS( ++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" ++ ${wxWidgets_SELECT_OPTIONS} --cxxflags ++ OUTPUT_VARIABLE wxWidgets_CXX_FLAGS ++ RESULT_VARIABLE RET ++ ERROR_QUIET ++ ) ++ IF(RET EQUAL 0) ++ STRING(STRIP "${wxWidgets_CXX_FLAGS}" wxWidgets_CXX_FLAGS) ++ SEPARATE_ARGUMENTS(wxWidgets_CXX_FLAGS) ++ ++ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") ++ ++ # parse definitions from cxxflags; drop -D* from CXXFLAGS and the -D prefix ++ STRING(REGEX MATCHALL "-D[^;]+" ++ wxWidgets_DEFINITIONS "${wxWidgets_CXX_FLAGS}") ++ STRING(REGEX REPLACE "-D[^;]+;" "" ++ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") ++ STRING(REPLACE "-D" "" ++ wxWidgets_DEFINITIONS "${wxWidgets_DEFINITIONS}") ++ ++ # parse include dirs from cxxflags; drop -I prefix ++ STRING(REGEX MATCHALL "-I[^;]+" ++ wxWidgets_INCLUDE_DIRS "${wxWidgets_CXX_FLAGS}") ++ STRING(REGEX REPLACE "-I[^;]+;" "" ++ wxWidgets_CXX_FLAGS "${wxWidgets_CXX_FLAGS}") ++ STRING(REPLACE "-I" "" ++ wxWidgets_INCLUDE_DIRS "${wxWidgets_INCLUDE_DIRS}") ++ ++ DBG_MSG_V("wxWidgets_DEFINITIONS=${wxWidgets_DEFINITIONS}") ++ DBG_MSG_V("wxWidgets_INCLUDE_DIRS=${wxWidgets_INCLUDE_DIRS}") ++ DBG_MSG_V("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}") ++ ++ ELSE(RET EQUAL 0) ++ SET(wxWidgets_FOUND FALSE) ++ DBG_MSG_V( ++ "${wxWidgets_CONFIG_EXECUTABLE} --cxxflags FAILED with RET=${RET}") ++ ENDIF(RET EQUAL 0) ++ ++ # run the wx-config program to get the libs ++ # - NOTE: wx-config doesn't verify that the libs requested exist ++ # it just produces the names. Maybe a TRY_COMPILE would ++ # be useful here... ++ STRING(REPLACE ";" "," ++ wxWidgets_FIND_COMPONENTS "${wxWidgets_FIND_COMPONENTS}") ++ EXECUTE_PROCESS( ++ COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" ++ ${wxWidgets_SELECT_OPTIONS} --libs ${wxWidgets_FIND_COMPONENTS} ++ OUTPUT_VARIABLE wxWidgets_LIBRARIES ++ RESULT_VARIABLE RET ++ ERROR_QUIET ++ ) ++ IF(RET EQUAL 0) ++ STRING(STRIP "${wxWidgets_LIBRARIES}" wxWidgets_LIBRARIES) ++ SEPARATE_ARGUMENTS(wxWidgets_LIBRARIES) ++ STRING(REPLACE "-framework;" "-framework " ++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") ++ STRING(REPLACE "-arch;" "-arch " ++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") ++ STRING(REPLACE "-isysroot;" "-isysroot " ++ wxWidgets_LIBRARIES "${wxWidgets_LIBRARIES}") ++ ++ # extract linkdirs (-L) for rpath (i.e., LINK_DIRECTORIES) ++ STRING(REGEX MATCHALL "-L[^;]+" ++ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARIES}") ++ STRING(REPLACE "-L" "" ++ wxWidgets_LIBRARY_DIRS "${wxWidgets_LIBRARY_DIRS}") ++ ++ DBG_MSG_V("wxWidgets_LIBRARIES=${wxWidgets_LIBRARIES}") ++ DBG_MSG_V("wxWidgets_LIBRARY_DIRS=${wxWidgets_LIBRARY_DIRS}") ++ ++ ELSE(RET EQUAL 0) ++ SET(wxWidgets_FOUND FALSE) ++ DBG_MSG("${wxWidgets_CONFIG_EXECUTABLE} --libs ${wxWidgets_FIND_COMPONENTS} FAILED with RET=${RET}") ++ ENDIF(RET EQUAL 0) ++ ENDIF(wxWidgets_CONFIG_EXECUTABLE) ++ ++#===================================================================== ++# Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE ++#===================================================================== ++ ELSE(wxWidgets_FIND_STYLE STREQUAL "unix") ++ IF(NOT wxWidgets_FIND_QUIETLY) ++ MESSAGE(STATUS ++ "${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n" ++ " Platform unknown/unsupported. It's neither WIN32 nor UNIX " ++ "find style." ++ ) ++ ENDIF(NOT wxWidgets_FIND_QUIETLY) ++ ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix") ++ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32") ++ ++# Debug output: ++DBG_MSG("wxWidgets_FOUND : ${wxWidgets_FOUND}") ++DBG_MSG("wxWidgets_INCLUDE_DIRS : ${wxWidgets_INCLUDE_DIRS}") ++DBG_MSG("wxWidgets_LIBRARY_DIRS : ${wxWidgets_LIBRARY_DIRS}") ++DBG_MSG("wxWidgets_LIBRARIES : ${wxWidgets_LIBRARIES}") ++DBG_MSG("wxWidgets_CXX_FLAGS : ${wxWidgets_CXX_FLAGS}") ++DBG_MSG("wxWidgets_USE_FILE : ${wxWidgets_USE_FILE}") ++ ++#===================================================================== ++#===================================================================== ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND) ++# Maintain consistency with all other variables. ++SET(wxWidgets_FOUND ${WXWIDGETS_FOUND}) ++ ++#===================================================================== ++# Macros for use in wxWidgets apps. ++# - This module will not fail to find wxWidgets based on the code ++# below. Hence, it's required to check for validity of: ++# ++# wxWidgets_wxrc_EXECUTABLE ++#===================================================================== ++ ++# Resource file compiler. ++FIND_PROGRAM(wxWidgets_wxrc_EXECUTABLE wxrc ++ ${wxWidgets_ROOT_DIR}/utils/wxrc/vc_msw ++ ) ++ ++# ++# WX_SPLIT_ARGUMENTS_ON(<keyword> <left> <right> <arg1> <arg2> ...) ++# ++# Sets <left> and <right> to contain arguments to the left and right, ++# respectively, of <keyword>. ++# ++# Example usage: ++# FUNCTION(WXWIDGETS_ADD_RESOURCES outfiles) ++# WX_SPLIT_ARGUMENTS_ON(OPTIONS wxrc_files wxrc_options ${ARGN}) ++# ... ++# ENDFUNCTION(WXWIDGETS_ADD_RESOURCES) ++# ++# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o file.C) ++# ++# NOTE: This is a generic piece of code that should be renamed to ++# SPLIT_ARGUMENTS_ON and put in a file serving the same purpose as ++# FindPackageStandardArgs.cmake. At the time of this writing ++# FindQt4.cmake has a QT4_EXTRACT_OPTIONS, which I basically copied ++# here a bit more generalized. So, there are already two find modules ++# using this approach. ++# ++FUNCTION(WX_SPLIT_ARGUMENTS_ON _keyword _leftvar _rightvar) ++ # FIXME: Document that the input variables will be cleared. ++ #LIST(APPEND ${_leftvar} "") ++ #LIST(APPEND ${_rightvar} "") ++ SET(${_leftvar} "") ++ SET(${_rightvar} "") ++ ++ SET(_doing_right FALSE) ++ FOREACH(element ${ARGN}) ++ IF("${element}" STREQUAL "${_keyword}") ++ SET(_doing_right TRUE) ++ ELSE("${element}" STREQUAL "${_keyword}") ++ IF(_doing_right) ++ LIST(APPEND ${_rightvar} "${element}") ++ ELSE(_doing_right) ++ LIST(APPEND ${_leftvar} "${element}") ++ ENDIF(_doing_right) ++ ENDIF("${element}" STREQUAL "${_keyword}") ++ ENDFOREACH(element) ++ ++ SET(${_leftvar} ${${_leftvar}} PARENT_SCOPE) ++ SET(${_rightvar} ${${_rightvar}} PARENT_SCOPE) ++ENDFUNCTION(WX_SPLIT_ARGUMENTS_ON) ++ ++# ++# WX_GET_DEPENDENCIES_FROM_XML( ++# <depends> ++# <match_pattern> ++# <clean_pattern> ++# <xml_contents> ++# <depends_path> ++# ) ++# ++# FIXME: Add documentation here... ++# ++FUNCTION(WX_GET_DEPENDENCIES_FROM_XML ++ _depends ++ _match_patt ++ _clean_patt ++ _xml_contents ++ _depends_path ++ ) ++ ++ STRING(REGEX MATCHALL ++ ${_match_patt} ++ dep_file_list ++ "${${_xml_contents}}" ++ ) ++ FOREACH(dep_file ${dep_file_list}) ++ STRING(REGEX REPLACE ${_clean_patt} "" dep_file "${dep_file}") ++ ++ # make the file have an absolute path ++ IF(NOT IS_ABSOLUTE "${dep_file}") ++ SET(dep_file "${${_depends_path}}/${dep_file}") ++ ENDIF(NOT IS_ABSOLUTE "${dep_file}") ++ ++ # append file to dependency list ++ LIST(APPEND ${_depends} "${dep_file}") ++ ENDFOREACH(dep_file) ++ ++ SET(${_depends} ${${_depends}} PARENT_SCOPE) ++ENDFUNCTION(WX_GET_DEPENDENCIES_FROM_XML) ++ ++# ++# WXWIDGETS_ADD_RESOURCES(<sources> <xrc_files> ++# OPTIONS <options> [NO_CPP_CODE]) ++# ++# Adds a custom command for resource file compilation of the ++# <xrc_files> and appends the output files to <sources>. ++# ++# Example usages: ++# WXWIDGETS_ADD_RESOURCES(sources xrc/main_frame.xrc) ++# WXWIDGETS_ADD_RESOURCES(sources ${xrc_files} OPTIONS -e -o altname.cxx) ++# ++FUNCTION(WXWIDGETS_ADD_RESOURCES _outfiles) ++ WX_SPLIT_ARGUMENTS_ON(OPTIONS rc_file_list rc_options ${ARGN}) ++ ++ # Parse files for dependencies. ++ SET(rc_file_list_abs "") ++ SET(rc_depends "") ++ FOREACH(rc_file ${rc_file_list}) ++ GET_FILENAME_COMPONENT(depends_path ${rc_file} PATH) ++ ++ GET_FILENAME_COMPONENT(rc_file_abs ${rc_file} ABSOLUTE) ++ LIST(APPEND rc_file_list_abs "${rc_file_abs}") ++ ++ # All files have absolute paths or paths relative to the location ++ # of the rc file. ++ FILE(READ "${rc_file_abs}" rc_file_contents) ++ ++ # get bitmap/bitmap2 files ++ WX_GET_DEPENDENCIES_FROM_XML( ++ rc_depends ++ "<bitmap[^<]+" ++ "^<bitmap[^>]*>" ++ rc_file_contents ++ depends_path ++ ) ++ ++ # get url files ++ WX_GET_DEPENDENCIES_FROM_XML( ++ rc_depends ++ "<url[^<]+" ++ "^<url[^>]*>" ++ rc_file_contents ++ depends_path ++ ) ++ ++ # get wxIcon files ++ WX_GET_DEPENDENCIES_FROM_XML( ++ rc_depends ++ "<object[^>]*class=\"wxIcon\"[^<]+" ++ "^<object[^>]*>" ++ rc_file_contents ++ depends_path ++ ) ++ ENDFOREACH(rc_file) ++ ++ # ++ # Parse options. ++ # ++ # If NO_CPP_CODE option specified, then produce .xrs file rather ++ # than a .cpp file (i.e., don't add the default --cpp-code option). ++ LIST(FIND rc_options NO_CPP_CODE index) ++ IF(index EQUAL -1) ++ LIST(APPEND rc_options --cpp-code) ++ # wxrc's default output filename for cpp code. ++ SET(outfile resource.cpp) ++ ELSE(index EQUAL -1) ++ LIST(REMOVE_AT rc_options ${index}) ++ # wxrc's default output filename for xrs file. ++ SET(outfile resource.xrs) ++ ENDIF(index EQUAL -1) ++ ++ # Get output name for use in ADD_CUSTOM_COMMAND. ++ # - short option scanning ++ LIST(FIND rc_options -o index) ++ IF(NOT index EQUAL -1) ++ MATH(EXPR filename_index "${index} + 1") ++ LIST(GET rc_options ${filename_index} outfile) ++ #LIST(REMOVE_AT rc_options ${index} ${filename_index}) ++ ENDIF(NOT index EQUAL -1) ++ # - long option scanning ++ STRING(REGEX MATCH "--output=[^;]*" outfile_opt "${rc_options}") ++ IF(outfile_opt) ++ STRING(REPLACE "--output=" "" outfile "${outfile_opt}") ++ ENDIF(outfile_opt) ++ #STRING(REGEX REPLACE "--output=[^;]*;?" "" rc_options "${rc_options}") ++ #STRING(REGEX REPLACE ";$" "" rc_options "${rc_options}") ++ ++ IF(NOT IS_ABSOLUTE "${outfile}") ++ SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}") ++ ENDIF(NOT IS_ABSOLUTE "${outfile}") ++ ADD_CUSTOM_COMMAND( ++ OUTPUT "${outfile}" ++ COMMAND ${wxWidgets_wxrc_EXECUTABLE} ${rc_options} ${rc_file_list_abs} ++ DEPENDS ${rc_file_list_abs} ${rc_depends} ++ ) ++ ++ # Add generated header to output file list. ++ LIST(FIND rc_options -e short_index) ++ LIST(FIND rc_options --extra-cpp-code long_index) ++ IF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1) ++ GET_FILENAME_COMPONENT(outfile_ext ${outfile} EXT) ++ STRING(REPLACE "${outfile_ext}" ".h" outfile_header "${outfile}") ++ LIST(APPEND ${_outfiles} "${outfile_header}") ++ SET_SOURCE_FILES_PROPERTIES( ++ "${outfile_header}" PROPERTIES GENERATED TRUE ++ ) ++ ENDIF(NOT short_index EQUAL -1 OR NOT long_index EQUAL -1) ++ ++ # Add generated file to output file list. ++ LIST(APPEND ${_outfiles} "${outfile}") ++ ++ SET(${_outfiles} ${${_outfiles}} PARENT_SCOPE) ++ENDFUNCTION(WXWIDGETS_ADD_RESOURCES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-01-25 21:20:20
|
Revision: 10768 http://plplot.svn.sourceforge.net/plplot/?rev=10768&view=rev Author: andrewross Date: 2010-01-25 21:20:11 +0000 (Mon, 25 Jan 2010) Log Message: ----------- Ensure .pal palette files are properly included in debian package. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/libplplot9.files Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-01-25 20:56:07 UTC (rev 10767) +++ branches/v5_9_5_debian/debian/changelog 2010-01-25 21:20:11 UTC (rev 10768) @@ -25,10 +25,11 @@ pulled in. * debian/rules: Remove setting of ITCL_LIBRARY which is not required with latest version of itcl. + * debian/libplplot9.files: Ensures .pal palette files are correctly installed * Rebuild package to use latest versions of gfortran (closes: #564065) and python (closes: #562411) - -- Andrew Ross <and...@us...> Thu, 21 Jan 2010 21:05:07 +0000 + -- Andrew Ross <and...@us...> Mon, 25 Jan 2010 21:19:07 +0000 plplot (5.9.2-4) UNRELEASED; urgency=low Modified: branches/v5_9_5_debian/debian/libplplot9.files =================================================================== --- branches/v5_9_5_debian/debian/libplplot9.files 2010-01-25 20:56:07 UTC (rev 10767) +++ branches/v5_9_5_debian/debian/libplplot9.files 2010-01-25 21:20:11 UTC (rev 10768) @@ -1,6 +1,7 @@ usr/lib usr/share/plplot*/*.map usr/share/plplot*/*.fnt +usr/share/plplot*/*.pal usr/share/doc/libplplot9 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-02-22 12:51:01
|
Revision: 10810 http://plplot.svn.sourceforge.net/plplot/?rev=10810&view=rev Author: andrewross Date: 2010-02-22 12:50:48 +0000 (Mon, 22 Feb 2010) Log Message: ----------- Update debian packages to use octave3.2. Octave 3.0 will shortly be dropped from unstable. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-02-21 17:00:15 UTC (rev 10809) +++ branches/v5_9_5_debian/debian/changelog 2010-02-22 12:50:48 UTC (rev 10810) @@ -1,5 +1,12 @@ -plplot (5.9.5-1) unstable; urgency=low +plplot (5.9.5-2) unstable; urgency=low + * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be + dropped. + + -- Andrew Ross <and...@us...> Mon, 22 Feb 2010 12:50:40 +0000 + +plplot (5.9.5-1) UNRELEASED; urgency=low + * New upstream release. * debian/patches/series: Remove the following patches which are no longer required as they are now included upstream Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-02-21 17:00:15 UTC (rev 10809) +++ branches/v5_9_5_debian/debian/control.in 2010-02-22 12:50:48 UTC (rev 10810) @@ -6,7 +6,7 @@ Standards-Version: 3.8.3 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, - libxi-dev, gfortran, itk3-dev, octave3.0-headers (>= 3.0.0-2), + libxi-dev, gfortran, itk3-dev, octave3.2-headers, libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, @@ -15,7 +15,7 @@ fastjar, swig, gnat [!armel !sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, ghostscript -Build-Conflicts: libplplot5, octave2.1-headers +Build-Conflicts: libplplot5, octave3.0-headers XS-Python-Version: all Homepage: http://www.plplot.org Vcs-Svn: https://plplot.svn.sourceforge.net/svnroot/plplot/trunk/debian This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-02-24 09:51:34
|
Revision: 10813 http://plplot.svn.sourceforge.net/plplot/?rev=10813&view=rev Author: andrewross Date: 2010-02-24 09:51:24 +0000 (Wed, 24 Feb 2010) Log Message: ----------- Explicitly enable gd driver - required for plplot9-driver-gd package. Once cairo / qt are fully integrated this will probably be dropped, but keep it for now. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/rules Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-02-23 22:17:20 UTC (rev 10812) +++ branches/v5_9_5_debian/debian/changelog 2010-02-24 09:51:24 UTC (rev 10813) @@ -2,6 +2,10 @@ * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be dropped. + * debian/rules: explicitly enable jpeg, png and gif drivers as they are + now disabled by default. Eventually these will be replaced by cairo + and qt drivers, but keep them in for now until these packages have + settled down. -- Andrew Ross <and...@us...> Mon, 22 Feb 2010 12:50:40 +0000 Modified: branches/v5_9_5_debian/debian/rules =================================================================== --- branches/v5_9_5_debian/debian/rules 2010-02-23 22:17:20 UTC (rev 10812) +++ branches/v5_9_5_debian/debian/rules 2010-02-24 09:51:24 UTC (rev 10813) @@ -56,7 +56,8 @@ CONFIGURE_OPTIONS = -DBUILD_TEST=ON -DHAVE_PTHREAD=ON \ -DBUILD_DOC=OFF -DCMAKE_INSTALL_PREFIX=/usr \ -DOCTAVE_OCT_DIR=$(OCTDIR) \ - -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF\ + -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF \ + -DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \ -DDEFAULT_NO_QT_DEVICES=ON \ $(ADA_OPTIONS) $(JAVA_OPTIONS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-02-26 19:49:39
|
Revision: 10816 http://plplot.svn.sourceforge.net/plplot/?rev=10816&view=rev Author: andrewross Date: 2010-02-26 19:49:32 +0000 (Fri, 26 Feb 2010) Log Message: ----------- Fix building of ada packages on armel. Ensure they are not built on sh4 (no gnat currently available). Force tclsh version to circumvent problems with tcl 8.4 and 8.5 both installed. Minor tweaks to control.in. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/rules Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-02-26 02:25:23 UTC (rev 10815) +++ branches/v5_9_5_debian/debian/changelog 2010-02-26 19:49:32 UTC (rev 10816) @@ -1,3 +1,16 @@ +plplot (5.9.5-3) unstable; urgency=low + + * debian/control.in: + + Remove Rafael Laboissiere from the list of uploaders as he has + now retired from Debian. + + Bump Debian standards version to 3.8.4. + * debian/control.in, debian/rules: Correctly disable ada support for sh4. + Enable ada support on armel now that gnat is available (closes: #568451). + * debian/rules: Force tclsh to /usr/bin/tclsh8.5 - avoids problems if + /usr/bin/tclsh points to a different version. + + -- Andrew Ross <and...@us...> Wed, 24 Feb 2010 13:25:40 +0000 + plplot (5.9.5-2) unstable; urgency=low * debian/control.in: Update to use octave3.2 - octave 3.0 will shortly be Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-02-26 02:25:23 UTC (rev 10815) +++ branches/v5_9_5_debian/debian/control.in 2010-02-26 19:49:32 UTC (rev 10816) @@ -2,8 +2,7 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> -Uploaders: Rafael Laboissiere <ra...@de...> -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.2-headers, @@ -12,7 +11,7 @@ quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, - fastjar, swig, gnat [!armel !sh4] + fastjar, swig, gnat [!sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, ghostscript Build-Conflicts: libplplot5, octave3.0-headers Modified: branches/v5_9_5_debian/debian/rules =================================================================== --- branches/v5_9_5_debian/debian/rules 2010-02-26 02:25:23 UTC (rev 10815) +++ branches/v5_9_5_debian/debian/rules 2010-02-26 19:49:32 UTC (rev 10816) @@ -34,7 +34,7 @@ # Disable Ada build on armel - gnat not available on armel at the moment. -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:armel:)) +ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:sh4:)) BUILD_ADA = no else BUILD_ADA = yes @@ -59,6 +59,7 @@ -DUSE_RPATH=OFF -DPLD_psttf=OFF -DENABLE_tk=ON -DENABLE_ocaml=OFF \ -DPLD_jpeg=ON -DPLD_png=ON -DPLD_gif=ON \ -DDEFAULT_NO_QT_DEVICES=ON \ + -DTCL_TCLSH=/usr/bin/tclsh8.5 \ $(ADA_OPTIONS) $(JAVA_OPTIONS) BUILD_DIR = $(debbase)/build_tmp This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-03-01 16:25:02
|
Revision: 10832 http://plplot.svn.sourceforge.net/plplot/?rev=10832&view=rev Author: andrewross Date: 2010-03-01 16:24:55 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Fix colourmap bug (patch from svn) which gave blank first page for ada examples. Update changelog to close another bug. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/patches/series Added Paths: ----------- branches/v5_9_5_debian/debian/patches/17_fix_cmap_support.diff Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-02-28 20:25:47 UTC (rev 10831) +++ branches/v5_9_5_debian/debian/changelog 2010-03-01 16:24:55 UTC (rev 10832) @@ -5,13 +5,16 @@ now retired from Debian (closes: #571874). + Bump Debian standards version to 3.8.4. * debian/control.in, debian/rules: Correctly disable ada support for - sh4. Enable ada support on armel now that gnat is available - (closes: #568451). + sh4 (closes: #572028). Enable ada support on armel now that gnat is + available (closes: #568451). * debian/rules: Force tclsh to /usr/bin/tclsh8.5 - avoids problems if tcl8.4 is also installed so /usr/bin/tclsh points to a different version. + * debian/patches/17_fix_cmap_support.diff, debian/patches/series: Add + bug fix patch from upstream to fix cmap palette support. This fixes + the blank pages in the ada examples (and possibly user code). - -- Andrew Ross <and...@us...> Wed, 24 Feb 2010 13:25:40 +0000 + -- Andrew Ross <and...@us...> Tue, 01 Mar 2010 14:03:40 +0000 plplot (5.9.5-2) unstable; urgency=low Added: branches/v5_9_5_debian/debian/patches/17_fix_cmap_support.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/17_fix_cmap_support.diff (rev 0) +++ branches/v5_9_5_debian/debian/patches/17_fix_cmap_support.diff 2010-03-01 16:24:55 UTC (rev 10832) @@ -0,0 +1,34 @@ +# Patch from upstream to fix bug with cmap palette support - causes problems with ada examples. + +diff -ur plplot-5.9.5-orig/src/plctrl.c plplot-5.9.5/src/plctrl.c +--- plplot-5.9.5.orig/src/plctrl.c 2009-01-18 20:24:12.000000000 +0000 ++++ plplot-5.9.5/src/plctrl.c 2010-01-18 23:52:40.000000000 +0000 +@@ -836,7 +836,8 @@ + /*--------------------------------------------------------------------------*\ + * plcmap0_def() + * +- * Initializes specified color map 0 color entry to its default. ++ * Initializes specified color map 0 color entry to its default for ++ * index range from imin to imax. + \*--------------------------------------------------------------------------*/ + + void +@@ -847,6 +848,9 @@ + int number_colors; + if(imin <= imax) { + cmap0_palette_read("", &number_colors, &r, &g, &b, &a); ++ for (i = imin; i <= MIN((number_colors-1),imax); i++) ++ color_def(i, r[i], g[i], b[i], a[i], ++ "colors defined by default cmap0 palette file"); + free(r); + free(g); + free(b); +@@ -860,7 +864,7 @@ + to opaque red as a warning. */ + for (i = MAX(number_colors, imin); i <= imax; i++) + color_def(i, 255, 0, 0, 1.0, +- "opaque red to mark not defined by palette file"); ++ "opaque red colour to mark not defined by palette file"); + } + + /*--------------------------------------------------------------------------*\ Property changes on: branches/v5_9_5_debian/debian/patches/17_fix_cmap_support.diff ___________________________________________________________________ Added: svn:eol-style + native Modified: branches/v5_9_5_debian/debian/patches/series =================================================================== --- branches/v5_9_5_debian/debian/patches/series 2010-02-28 20:25:47 UTC (rev 10831) +++ branches/v5_9_5_debian/debian/patches/series 2010-03-01 16:24:55 UTC (rev 10832) @@ -3,3 +3,4 @@ 07_octave_prune_examples.diff 11_minus-sign-manpage.diff 16_wxwidget-with-cmake-2.8.diff +17_fix_cmap_support.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-08-12 21:36:37
|
Revision: 11130 http://plplot.svn.sourceforge.net/plplot/?rev=11130&view=rev Author: andrewross Date: 2010-08-12 21:36:30 +0000 (Thu, 12 Aug 2010) Log Message: ----------- Backport updates for debian package to 5.9.5 in unstable. Freeze is now on so can't upload 5.9.6 packages. Fixes numpy bug. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/plplot-bin.files branches/v5_9_5_debian/debian/rules Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-08-12 21:24:44 UTC (rev 11129) +++ branches/v5_9_5_debian/debian/changelog 2010-08-12 21:36:30 UTC (rev 11130) @@ -1,3 +1,15 @@ +plplot (5.9.5-4) unstable; urgency=low + + * debian/rules, debian/control.in: update to use dh_numpy in debian/rules + to get versioned numpy support. Requires python numpy >= 1:1.1.4.1-4~ + (closes: 590770). + * debian/control.in: Bump standards version to 3.9.1. + * debian/control.in, debian/plplot-bin.files: remove references to plrender + in package descriptions (no longer included) and also remove plpr / plm2gif + scripts which rely on plrender. + + -- Andrew Ross <and...@us...> Thu, 12 Jul 2010 20:26:31 +0100 + plplot (5.9.5-3) unstable; urgency=low * debian/control.in: Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-08-12 21:24:44 UTC (rev 11129) +++ branches/v5_9_5_debian/debian/control.in 2010-08-12 21:36:30 UTC (rev 11130) @@ -2,7 +2,7 @@ Section: math Priority: optional Maintainer: Andrew Ross <and...@us...> -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.2-headers, @@ -10,7 +10,7 @@ libxml-parser-perl, libxml-dom-perl, libltdl3-dev, pkg-config, quilt, slice, python-gtk2-dev, libwxgtk2.8-dev, python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), - python-numpy (>= 1.0.4-4), ttf-freefont, default-jdk, + python-numpy (>= 1:1.4.1-4~), ttf-freefont, default-jdk, fastjar, swig, gnat [!sh4] Build-Depends-Indep: docbook-xml, docbook, docbook-dsssl, docbook-xsl, docbook2x, opensp, jadetex, ghostscript @@ -140,8 +140,6 @@ This package contains the following utilities associated with PLplot. . * pltek - review a Tektronix vector file - * plm2gif - converts PLplot metafiles to GIF files - * plpr - converts PLplot metafile to something the printer will understand Package: plplot9-driver-xwin Architecture: any @@ -189,8 +187,7 @@ . This package contains the Tcl/Tk support for PLplot: shared libraries, Tcl modules, the Tk driver, and some programs for interactive use of - PLplot (plserver and pltcl). Also included is the utility program - plrender to render PLplot metafiles. + PLplot (plserver and pltcl). Package: plplot-tcl-dev Architecture: any @@ -249,7 +246,7 @@ Architecture: any Section: python Depends: libplplot9 (= ${binary:Version}), ${shlibs:Depends}, - ${python:Depends}, python-numpy, ${misc:Depends} + ${python:Depends}, ${misc:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python support for PLplot, a plotting library Modified: branches/v5_9_5_debian/debian/plplot-bin.files =================================================================== --- branches/v5_9_5_debian/debian/plplot-bin.files 2010-08-12 21:24:44 UTC (rev 11129) +++ branches/v5_9_5_debian/debian/plplot-bin.files 2010-08-12 21:36:30 UTC (rev 11130) @@ -1,3 +1,3 @@ -usr/bin -usr/share/man +usr/bin/pltek +usr/share/man/man1/pltek.1 usr/share/doc/plplot-bin Modified: branches/v5_9_5_debian/debian/rules =================================================================== --- branches/v5_9_5_debian/debian/rules 2010-08-12 21:24:44 UTC (rev 11129) +++ branches/v5_9_5_debian/debian/rules 2010-08-12 21:36:30 UTC (rev 11130) @@ -180,7 +180,7 @@ install-python%: build-arch-stamp ( cd $(BUILD_DIR) ; \ - cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ + cmake $(SRC_DIR) $(CONFIGURE_OPTIONS) -DENABLE_python=ON -DPYTHON_EXECUTABLE=/usr/bin/python$* -DPYTHON_LIBRARIES=/usr/lib/python$* -DPYTHON_LIBRARY=/usr/lib/python$*/config/libpython$*.so -DPYTHON_INCLUDE_PATH="/usr/include/python$*;/usr/include/numpy;/usr/lib/pyshared/python$*/numpy/core/include/numpy" -DNUMERIC_INCLUDE_PATH=/usr/include/numpy ; \ for d in python ; do \ ( cd bindings/$$d; \ $(MAKE) clean ; \ @@ -212,6 +212,7 @@ dh_installchangelogs --package=$(libpkg) --package=libcsiro0 dh_pycentral --package=python-plplot + dh_numpy dh_strip -a dh_compress -a -Xexamples/ dh_fixperms -a This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-08-24 11:02:16
|
Revision: 11148 http://plplot.svn.sourceforge.net/plplot/?rev=11148&view=rev Author: andrewross Date: 2010-08-24 11:02:10 +0000 (Tue, 24 Aug 2010) Log Message: ----------- Fix spelling mistake in Debian cairo driver package. Closes Debian bug 592970. Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-08-20 18:43:39 UTC (rev 11147) +++ branches/v5_9_5_debian/debian/changelog 2010-08-24 11:02:10 UTC (rev 11148) @@ -7,8 +7,10 @@ * debian/control.in, debian/plplot-bin.files: remove references to plrender in package descriptions (no longer included) and also remove plpr / plm2gif scripts which rely on plrender. + * debian/control.in: Fix spelling mistake in cairo driver package + (closes: 592970) - -- Andrew Ross <and...@us...> Thu, 12 Jul 2010 20:26:31 +0100 + -- Andrew Ross <and...@us...> Tue, 24 Aug 2010 10:50:26 +0100 plplot (5.9.5-3) unstable; urgency=low Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-08-20 18:43:39 UTC (rev 11147) +++ branches/v5_9_5_debian/debian/control.in 2010-08-24 11:02:10 UTC (rev 11148) @@ -239,7 +239,7 @@ virtually all aspects of plotting are configurable. . This package provides the Cairo driver module for PLplot. It is based - on the Cairo 2D graphics library with supportting multiple output devices + on the Cairo 2D graphics library with supporting multiple output devices (X-Window, PDF, PostScript, and PNG). Package: python-plplot This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <and...@us...> - 2010-08-26 21:25:53
|
Revision: 11152 http://plplot.svn.sourceforge.net/plplot/?rev=11152&view=rev Author: andrewross Date: 2010-08-26 21:25:42 +0000 (Thu, 26 Aug 2010) Log Message: ----------- Fix up debian 5.9.5 packages so that the fortran libraries build correctly with cmake-2.8.2 (now in unstable). Modified Paths: -------------- branches/v5_9_5_debian/debian/changelog branches/v5_9_5_debian/debian/control.in branches/v5_9_5_debian/debian/patches/series Added Paths: ----------- branches/v5_9_5_debian/debian/patches/18_update_cmake_fortran.diff Modified: branches/v5_9_5_debian/debian/changelog =================================================================== --- branches/v5_9_5_debian/debian/changelog 2010-08-24 11:12:35 UTC (rev 11151) +++ branches/v5_9_5_debian/debian/changelog 2010-08-26 21:25:42 UTC (rev 11152) @@ -9,8 +9,11 @@ scripts which rely on plrender. * debian/control.in: Fix spelling mistake in cairo driver package (closes: 592970) + * debian/patches/18_update_cmake_fortran.diff: Remove plplot workaround for + cmake fortran support as this is no longer needed with cmake 2.8.2 and + causes errors building the f77 and f95 libraries. - -- Andrew Ross <and...@us...> Tue, 24 Aug 2010 10:50:26 +0100 + -- Andrew Ross <and...@us...> Thu, 26 Aug 2010 13:38:26 +0100 plplot (5.9.5-3) unstable; urgency=low Modified: branches/v5_9_5_debian/debian/control.in =================================================================== --- branches/v5_9_5_debian/debian/control.in 2010-08-24 11:12:35 UTC (rev 11151) +++ branches/v5_9_5_debian/debian/control.in 2010-08-26 21:25:42 UTC (rev 11152) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Andrew Ross <and...@us...> Standards-Version: 3.9.1 -Build-Depends: cmake (>= 2.6.3), debhelper (>= 7), +Build-Depends: cmake (>= 2.8.2), debhelper (>= 7), tcl8.5-dev, tk8.5-dev, itcl3-dev, libx11-dev, libxext-dev, libxi-dev, gfortran, itk3-dev, octave3.2-headers, libgd2-noxpm-dev | libgd2-xpm-dev, m4, libqhull-dev (>= 2003.1-8), Added: branches/v5_9_5_debian/debian/patches/18_update_cmake_fortran.diff =================================================================== --- branches/v5_9_5_debian/debian/patches/18_update_cmake_fortran.diff (rev 0) +++ branches/v5_9_5_debian/debian/patches/18_update_cmake_fortran.diff 2010-08-26 21:25:42 UTC (rev 11152) @@ -0,0 +1,206 @@ +# Patch to remove upstream workaround for cmake fortran support as this is not needed with cmake 2.8.2 + +diff -urN plplot-5.9.5.orig/cmake/modules/CMakeFortranInformation.cmake plplot-5.9.5/cmake/modules/CMakeFortranInformation.cmake +--- plplot-5.9.5.orig/cmake/modules/CMakeFortranInformation.cmake 2010-08-26 11:20:36.000000000 +0100 ++++ plplot-5.9.5/cmake/modules/CMakeFortranInformation.cmake 1970-01-01 01:00:00.000000000 +0100 +@@ -1,189 +0,0 @@ +- +-# This file sets the basic flags for the Fortran language in CMake. +-# It also loads the available platform file for the system-compiler +-# if it exists. +- +-GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE) +-# since the gnu compiler has several names force g++ +-IF(CMAKE_COMPILER_IS_GNUG77) +- SET(CMAKE_BASE_NAME g77) +-ENDIF(CMAKE_COMPILER_IS_GNUG77) +-IF(CMAKE_Fortran_COMPILER_ID) +- IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake) +- SET(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER_ID}-Fortran) +- ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake) +-ENDIF(CMAKE_Fortran_COMPILER_ID) +-IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +- # Use this file if it exists. +- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE +- ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +-ELSE(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +- # This one apparently doesn't have to actually exist, see OPTIONAL below. +- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE +- ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +-ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake) +-INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) +- +-# This should be included before the _INIT variables are +-# used to initialize the cache. Since the rule variables +-# have if blocks on them, users can still define them here. +-# But, it should still be after the platform file so changes can +-# be made to those values. +- +-IF(CMAKE_USER_MAKE_RULES_OVERRIDE) +- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE}) +-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE) +- +-IF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran) +- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran}) +-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran) +- +- +-# Fortran needs cmake to do a requires step during its build process to +-# catch any modules +-SET(CMAKE_NEEDS_REQUIRES_STEP_Fortran_FLAG 1) +- +-# Create a set of shared library variable specific to Fortran +-# For 90% of the systems, these are the same flags as the C versions +-# so if these are not set just copy the flags from the c version +-IF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS) +- SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS) +- +-IF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS) +- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS) +- +-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS) +- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS}) +-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS) +- +-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG) +- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG) +- +-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP) +- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP) +- +-IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG) +- SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG}) +-ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG) +- +-# repeat for modules +-IF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS) +- SET(CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS) +- +-IF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS) +- SET(CMAKE_SHARED_MODULE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS}) +-ENDIF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS) +- +-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG) +- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG}) +-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG) +- +-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP) +- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP}) +-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP) +- +-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG) +- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG}) +-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG) +- +-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP) +- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP}) +-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP) +- +-IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG) +- SET(CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG}) +-ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG) +- +-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH) +- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH}) +-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH) +- +-IF(NOT CMAKE_INCLUDE_FLAG_Fortran) +- SET(CMAKE_INCLUDE_FLAG_Fortran ${CMAKE_INCLUDE_FLAG_C}) +-ENDIF(NOT CMAKE_INCLUDE_FLAG_Fortran) +- +-IF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran) +- SET(CMAKE_INCLUDE_FLAG_SEP_Fortran ${CMAKE_INCLUDE_FLAG_SEP_C}) +-ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran) +- +-SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") +- +-SET(CMAKE_Fortran_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}") +-# avoid just having a space as the initial value for the cache +-IF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ") +- SET(CMAKE_Fortran_FLAGS_INIT) +-ENDIF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ") +-SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING +- "Flags for Fortran compiler.") +- +-INCLUDE(CMakeCommonLanguageInclude) +- +-# now define the following rule variables +-# CMAKE_Fortran_CREATE_SHARED_LIBRARY +-# CMAKE_Fortran_CREATE_SHARED_MODULE +-# CMAKE_Fortran_CREATE_STATIC_LIBRARY +-# CMAKE_Fortran_COMPILE_OBJECT +-# CMAKE_Fortran_LINK_EXECUTABLE +- +-# create a Fortran shared library +-IF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY) +- SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY +- "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") +-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY) +- +-# create a Fortran shared module just copy the shared library rule +-IF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE) +- SET(CMAKE_Fortran_CREATE_SHARED_MODULE ${CMAKE_Fortran_CREATE_SHARED_LIBRARY}) +-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE) +- +-# create a Fortran static library +-IF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY) +- SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY +- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> " +- "<CMAKE_RANLIB> <TARGET> ") +-ENDIF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY) +- +-# compile a Fortran file into an object file +-IF(NOT CMAKE_Fortran_COMPILE_OBJECT) +- SET(CMAKE_Fortran_COMPILE_OBJECT +- "<CMAKE_Fortran_COMPILER> -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>") +-ENDIF(NOT CMAKE_Fortran_COMPILE_OBJECT) +- +-# link a fortran program +-IF(NOT CMAKE_Fortran_LINK_EXECUTABLE) +- SET(CMAKE_Fortran_LINK_EXECUTABLE +- "<CMAKE_Fortran_COMPILER> <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") +-ENDIF(NOT CMAKE_Fortran_LINK_EXECUTABLE) +- +-IF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT) +- SET(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}" +- CACHE STRING "Libraries linked by defalut with all Fortran applications.") +- MARK_AS_ADVANCED(CMAKE_Fortran_STANDARD_LIBRARIES) +-ENDIF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT) +- +-IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +- SET (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING +- "Flags used by the compiler during debug builds.") +- SET (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING +- "Flags used by the compiler during release minsize builds.") +- SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING +- "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).") +- SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING +- "Flags used by the compiler during Release with Debug Info builds.") +- +-ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS) +- +-MARK_AS_ADVANCED( +-CMAKE_Fortran_FLAGS +-CMAKE_Fortran_FLAGS_DEBUG +-CMAKE_Fortran_FLAGS_MINSIZEREL +-CMAKE_Fortran_FLAGS_RELEASE +-CMAKE_Fortran_FLAGS_RELWITHDEBINFO) +- +-# set this variable so we can avoid loading this more than once. +-SET(CMAKE_Fortran_INFORMATION_LOADED 1) +diff -urN plplot-5.9.5.orig/cmake/modules/language_support.cmake plplot-5.9.5/cmake/modules/language_support.cmake +--- plplot-5.9.5.orig/cmake/modules/language_support.cmake 2010-08-26 21:45:20.000000000 +0100 ++++ plplot-5.9.5/cmake/modules/language_support.cmake 2010-08-26 21:51:17.000000000 +0100 +@@ -49,7 +49,6 @@ + elseif(language STREQUAL "Fortran") + set(language_special ON) + set(language_files +- CMakeFortranInformation.cmake + Platform/Cygwin-GNU-Fortran.cmake + Platform/Windows-GNU-Fortran.cmake + Platform/Windows-df.cmake Modified: branches/v5_9_5_debian/debian/patches/series =================================================================== --- branches/v5_9_5_debian/debian/patches/series 2010-08-24 11:12:35 UTC (rev 11151) +++ branches/v5_9_5_debian/debian/patches/series 2010-08-26 21:25:42 UTC (rev 11152) @@ -4,3 +4,4 @@ 11_minus-sign-manpage.diff 16_wxwidget-with-cmake-2.8.diff 17_fix_cmap_support.diff +18_update_cmake_fortran.diff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |