plplot-cvs — For PLplot svn commit messages

[Plplot-cvs] SF.net SVN: plplot:[12888] trunk/cmake/epa_build/ExternalProject.cmake

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

Revision: 12888
          http://sourceforge.net/p/plplot/code/12888
Author:   airwin
Date:     2013-12-19 19:13:32 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
I have just proved CMake 2.8.11.2 can unpack *.xz archives using the

cmake -E tar zxf *.xz

command.  Therefore, drop using a system tar workaround for this
special case which reduces the differences between the epa_build
version of ExternalProject.cmake and the CMake version (which is
a good direction to go because eventually we may be able to
completely drop the epa_build variant of ExternalProject.cmake

Modified Paths:
--------------
    trunk/cmake/epa_build/ExternalProject.cmake

Modified: trunk/cmake/epa_build/ExternalProject.cmake
===================================================================
--- trunk/cmake/epa_build/ExternalProject.cmake	2013-12-19 17:24:09 UTC (rev 12887)
+++ trunk/cmake/epa_build/ExternalProject.cmake	2013-12-19 19:13:32 UTC (rev 12888)
@@ -636,18 +636,9 @@
 # Extract it:
 #
 message(STATUS \"extracting... [tar ${args}]\")
-if(filename MATCHES \"tar\\\\.xz$\")
-  # --force-local required so that drive-letter colon for filename on
-  # Windows platforms is not interpreted as a remote host.
-  find_program(TAR_EXECUTABLE tar)
-  execute_process(COMMAND \${TAR_EXECUTABLE} --force-local -Jxf \${filename}
-    WORKING_DIRECTORY \${ut_dir}
-    RESULT_VARIABLE rv)
-else(filename MATCHES \"tar\\\\.xz$\")
-  execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename}
-    WORKING_DIRECTORY \${ut_dir}
-    RESULT_VARIABLE rv)
-endif(filename MATCHES \"tar\\\\.xz$\")
+execute_process(COMMAND \${CMAKE_COMMAND} -E tar ${args} \${filename}
+  WORKING_DIRECTORY \${ut_dir}
+  RESULT_VARIABLE rv)
 
 if(NOT rv EQUAL 0)
   message(STATUS \"extracting... [error clean up]\")

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

[Plplot-cvs] SF.net SVN: plplot:[12887] trunk/README.release

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

Revision: 12887
          http://sourceforge.net/p/plplot/code/12887
Author:   airwin
Date:     2013-12-19 17:24:09 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Give testers personal credit for all their hard work.

Modified Paths:
--------------
    trunk/README.release

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2013-12-19 13:17:16 UTC (rev 12886)
+++ trunk/README.release	2013-12-19 17:24:09 UTC (rev 12887)
@@ -176,45 +176,47 @@
 tree configured with our traditional (Make + pkg-config) build system
 for the examples.
 
-2.1 Comprehensive tests were run for a complete system build
+* Alan W. Irwin ran comprehensive tests for a complete system build
 environment on 64-bit Debian Wheezy Linux for AMD-64 hardware.
 
-2.2 Comprehensive tests were run for a limited (qt, cairo, wxwidgets,
+* Alan W. Irwin ran comprehensive testsfor a limited (qt, cairo, wxwidgets,
 and octave PLplot components were dropped) epa_build environment on
 64-bit Debian Wheezy Linux for AMD-64 hardware.
 
-2.3 Comprehensive tests were run for an almost complete epa_build
+* Alan W. Irwin ran comprehensive tests for an almost complete epa_build
 environment (only the wxwidgets and octave components of PLplot were
 dropped) on 64-bit Debian Wheezy Linux for AMD-64 hardware.
 
-2.4 Comprehensive tests were run for a limited (qt, cairo, wxwidgets,
+* Alan W. Irwin ran comprehensive tests for a limited (qt, cairo, wxwidgets,
 and octave PLplot components were dropped) epa_build environment for
 32-bit MinGW/MSYS/Wine for AMD-64 hardware.
 
-2.5 Fairly comprehensive tests (i.e., for the shared library/dynamic
-drivers case use the test_noninteractive and test_interactive targets
-in the build tree) were run for a complete system build environment on
-64-bit Debian unstable Linux for AMD-64 hardware.
+* Andrew Ross ran fairly comprehensive tests (i.e., for the shared
+library/dynamic drivers case use the test_noninteractive and
+test_interactive targets in the build tree) for a complete system
+build environment on 64-bit Debian unstable Linux for AMD-64 hardware.
 
-2.6 Fairly comprehensive tests (i.e., for the shared library/dynamic
+* Andrew Ross ran fairly comprehensive tests (i.e., for the shared library/dynamic
 drivers case use the test_noninteractive and test_interactive targets
-in the build tree) were run for a complete system build environment on
+in the build tree) for a complete system build environment on
 64-bit Ubuntu Saucy (13.10) Linux for AMD-64 hardware.
 
-2.7 Build tests and some limited run-time tests (checking a few things
-by hand) were run for the static libraries/nondynamic devices case for
-a limited build environment (most PLplot components dropped other than
-wxwidgets 2.8) for the Visual Studio 2008 IDE (with associated MSVC
-compiler) on 32-bit Windows 7 for AMD-64 hardware.  The "Visual Studio
-9 2008" generator yielded good results.  Only x86 builds were tested.
+* Phil Rosenberg ran build tests and limited run-time tests (checking
+by hand that some components of PLplot worked) for the static
+libraries/nondynamic devices case for a limited build environment
+(most PLplot components dropped other than wxwidgets 2.8) for the
+Visual Studio 2008 IDE (with associated MSVC compiler) on 32-bit
+Windows 7 for AMD-64 hardware.  The "Visual Studio 9 2008" generator
+yielded good results.  Only x86 builds were tested.
 
-2.8 Build tests and some limited run-time tests (checking a few things
-by hand) were run for the static libraries/nondynamic devices case for
-a limited build environment (most PLplot components dropped other than
-wxwidgets 3.0) for the Visual Studio 2012 IDE (with associated MSVC
-compiler) on Windows 8 for AMD-64 hardware.  Both x86 and x64 builds
-were tested.  The combination of "NMake Makefiles" generator and MSVC
-compiler yielded good build results if CMake patches (available at
+* Phil Rosenberg ran build tests and limited run-time tests (checking
+by hand that some components of PLplot worked) for the static
+libraries/nondynamic devices case for a limited build environment
+(most PLplot components dropped other than wxwidgets 3.0) for the
+Visual Studio 2012 IDE (with associated MSVC compiler) on Windows 8
+for AMD-64 hardware.  Both x86 and x64 builds were tested.  The
+combination of "NMake Makefiles" generator and MSVC compiler yielded
+good build results if CMake patches (available at
 http://www.cmake.org/Bug/view.php?id=14587 and
 http://www.cmake.org/Bug/view.php?id=14642) to allow use of
 wxwidgets-3.0 were applied.  With those patches some run-time problems

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

[Plplot-cvs] SF.net SVN: plplot:[12886] trunk/cmake/epa_build/qt4_lite/CMakeLists.txt

[<and...@us...>]

Revision: 12886
          http://sourceforge.net/p/plplot/code/12886
Author:   andrewross
Date:     2013-12-19 13:17:16 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Comment out Alan's debugging code prior to the release.

Modified Paths:
--------------
    trunk/cmake/epa_build/qt4_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/qt4_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/qt4_lite/CMakeLists.txt	2013-12-19 11:43:30 UTC (rev 12885)
+++ trunk/cmake/epa_build/qt4_lite/CMakeLists.txt	2013-12-19 13:17:16 UTC (rev 12886)
@@ -63,7 +63,7 @@
 # Data that is related to downloads.
 set(URL http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz)
 # Temporary to save download bandwidth/time while debugging this.
-set(URL /home/software/build_qt4/qt-everywhere-opensource-src-4.8.5.tar.gz)
+#set(URL /home/software/build_qt4/qt-everywhere-opensource-src-4.8.5.tar.gz)
 set(DOWNLOAD_HASH_TYPE MD5)
 set(DOWNLOAD_HASH 1864987bdbb2f58f8ae8b350dfdbe133)
 

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

[Plplot-cvs] SF.net SVN: plplot:[12885] trunk/bindings/c++

[<and...@us...>]

Revision: 12885
          http://sourceforge.net/p/plplot/code/12885
Author:   andrewross
Date:     2013-12-19 11:43:30 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
cont_width argument for plcolorbar should be PLFLT not PLINT.

Modified Paths:
--------------
    trunk/bindings/c++/plstream.cc
    trunk/bindings/c++/plstream.h

Modified: trunk/bindings/c++/plstream.cc
===================================================================
--- trunk/bindings/c++/plstream.cc	2013-12-19 01:40:05 UTC (rev 12884)
+++ trunk/bindings/c++/plstream.cc	2013-12-19 11:43:30 UTC (rev 12885)
@@ -1018,7 +1018,7 @@
                          PLFLT x_length, PLFLT y_length,
                          PLINT bg_color, PLINT bb_color, PLINT bb_style,
                          PLFLT low_cap_color, PLFLT high_cap_color,
-                         PLINT cont_color, PLINT cont_width,
+                         PLINT cont_color, PLFLT cont_width,
                          PLINT n_labels, PLINT *label_opts, const char * const *label,
                          PLINT n_axes, const char * const *axis_opts,
                          PLFLT *ticks, PLINT *sub_ticks,

Modified: trunk/bindings/c++/plstream.h
===================================================================
--- trunk/bindings/c++/plstream.h	2013-12-19 01:40:05 UTC (rev 12884)
+++ trunk/bindings/c++/plstream.h	2013-12-19 11:43:30 UTC (rev 12885)
@@ -447,7 +447,7 @@
                    PLFLT x_length, PLFLT y_length,
                    PLINT bg_color, PLINT bb_color, PLINT bb_style,
                    PLFLT low_cap_color, PLFLT high_cap_color,
-                   PLINT cont_color, PLINT cont_width,
+                   PLINT cont_color, PLFLT cont_width,
                    PLINT n_labels, PLINT *label_opts, const char * const *label,
                    PLINT n_axes, const char * const *axis_opts,
                    PLFLT *ticks, PLINT *sub_ticks,

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

Re: [Plplot-cvs] SF.net SVN: plplot:[12881] trunk/bindings/tk/tkMain.c

[Arjen M. <Arj...@de...>]

HI Alan,

needless to say they should not have gotten in there. I thought I had been careful
not to commit the thing :(. Thanks for noticing and fixing this.

Regards,

Arjen

> -----Original Message-----
> From: ai...@us... [mailto:ai...@us...]
> Sent: Thursday, December 19, 2013 2:25 AM
> To: plp...@li...
> Subject: [Plplot-cvs] SF.net SVN: plplot:[12881] trunk/bindings/tk/tkMain.c
>
> Revision: 12881
>           http://sourceforge.net/p/plplot/code/12881
> Author:   airwin
> Date:     2013-12-19 01:25:14 +0000 (Thu, 19 Dec 2013)
> Log Message:
> -----------
> Comment out debug print statements that somehow got into a recent commit.
>
> Modified Paths:
> --------------
>     trunk/bindings/tk/tkMain.c
>
> Modified: trunk/bindings/tk/tkMain.c
> =============================================================
> ======
> --- trunk/bindings/tk/tkMain.c        2013-12-19 00:46:00 UTC (rev 12880)
> +++ trunk/bindings/tk/tkMain.c        2013-12-19 01:25:14 UTC (rev 12881)
> @@ -204,7 +204,7 @@
>      //
>      // Parse command-line arguments.
>      //
> -    fprintf( stderr, "Before Tk_ParseArgv\n" );
> +    //fprintf( stderr, "Before Tk_ParseArgv\n" );
>
>      if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
>           != TCL_OK )
> @@ -212,7 +212,7 @@
>          fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
>          exit( 1 );
>      }
> -    fprintf( stderr, "After Tk_ParseArgv\n" );
> +    //fprintf( stderr, "After Tk_ParseArgv\n" );
>      if ( name == NULL )
>      {
>          if ( fileName != NULL )
> @@ -315,7 +315,7 @@
>      // and "argv".  Also set the "geometry" variable from the geometry
>      // specified on the command line.
>      //
> -    fprintf( stderr, "Before Tcl_Merge\n" );
> +    //fprintf( stderr, "Before Tcl_Merge\n" );
>
>      args = Tcl_Merge( argc - 1, ( CONST char * CONST * )argv + 1 );
>      Tcl_SetVar( interp, "argv", args, TCL_GLOBAL_ONLY ); @@ -323,7 +323,7 @@
>      sprintf( buf, "%d", argc - 1 );
>      Tcl_SetVar( interp, "argc", buf, TCL_GLOBAL_ONLY );
>
> -    fprintf( stderr, "After Tcl_Merge\n" );
> +    //fprintf( stderr, "After Tcl_Merge\n" );
>      if ( geometry != NULL )
>      {
>          Tcl_SetVar( interp, "geometry", geometry, TCL_GLOBAL_ONLY ); @@ -345,7
> +345,7 @@
>      //
>      // Invoke application-specific initialization.
>      //
> -    fprintf( stderr, "Before AppInit\n" );
> +    //fprintf( stderr, "Before AppInit\n" );
>
>      if ( ( *AppInit )( interp ) != TCL_OK )
>      {
> @@ -369,7 +369,7 @@
>      //
>      // Process the startup script, if any.
>      //
> -    fprintf( stderr, "Before startup\n" );
> +    //fprintf( stderr, "Before startup\n" );
>
>      if ( script != NULL )
>      {
> @@ -384,7 +384,7 @@
>      //
>      // Invoke the script specified on the command line, if any.
>      //
> -    fprintf( stderr, "Before source\n" );
> +    //fprintf( stderr, "Before source\n" );
>
>      if ( fileName != NULL )
>      {
> @@ -448,7 +448,7 @@
>      // are no windows left, Tk_MainLoop returns and we exit.
>      //
>
> -    fprintf( stderr, "Before Tk_MainLoop\n" );
> +    //fprintf( stderr, "Before Tk_MainLoop\n" );
>      Tk_MainLoop();
>
>      //
>
> This was sent by the SourceForge.net collaborative development platform, the
> world's largest Open Source development site.
>
>
> ------------------------------------------------------------------------------
> Rapidly troubleshoot problems before they affect your business. Most IT
> organizations don't have a clear picture of how application performance affects their
> revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP
> application. Start your 15-day FREE TRIAL of AppDynamics Pro!
> http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
> _______________________________________________
> Plplot-cvs mailing list
> Plp...@li...
> https://lists.sourceforge.net/lists/listinfo/plplot-cvs

DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited. The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail.

[Plplot-cvs] SF.net SVN: plplot:[12884] trunk/cmake/epa_build

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

Revision: 12884
          http://sourceforge.net/p/plplot/code/12884
Author:   airwin
Date:     2013-12-19 01:40:05 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Temporarily drop wxwidgets from epa_build because it is not required
for the plplot_lite epa_build configuration on Windows and Unix, the
plplot epa_build configuration does not work yet on Windows (because
of issues building the full set of PLplot dependencies), and the
plplot epa_build configuration on Unix of wxwidgets requires a
complete epa_build of the entire stack of gtk libraries in order to
have access to a consistent set of those libraries.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/plplot_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -401,7 +401,6 @@
     ndiff
     plplot
     plplot_lite
-    wxwidgets
     pango
     qt4_lite
     )

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -29,7 +29,6 @@
   libharu
   libqhull
   shapelib
-  wxwidgets
   pango
   qt4_lite
   )
@@ -50,7 +49,13 @@
 set(FFLAGS "$ENV{FFLAGS}")
 
 # Leave everything ON by default for plplot.
-set(cmake_args)
+# Except for turning off all wxwidgets dependencies temporarily because
+# of mixed linking issues until epa_build implements build configurations
+# for a consistent stack of libraries for all of gtk.
+set(cmake_args
+  -DPLD_wxwidgets=OFF
+  -DENABLE_wxwidgets=OFF
+  )
 
 # Assumption that the top-level local PLplot source tree is two directories
 # up from the present top-level directory for epa_build.
@@ -80,10 +85,15 @@
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
   string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
     )
-  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
 ExternalProject_Add(
@@ -94,6 +104,25 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  ${TEST_COMMAND}
+  TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
+
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-19 01:40:05 UTC (rev 12884)
@@ -84,10 +84,15 @@
 
 if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
   string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
-  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
-    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_test_interactive no"
     )
-  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\" --do_ctest no --do_test_noninteractive no"
+    )
+
 endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
 
 ExternalProject_Add(
@@ -98,6 +103,25 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  ${TEST_COMMAND}
+  TEST_COMMAND ""
   STEP_TARGETS configure build install test
   )
+
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+    APPEND
+    )
+
+  add_custom_command(
+    OUTPUT
+    ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+    COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+    COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+    APPEND
+    )
+
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)

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

[Plplot-cvs] SF.net SVN: plplot:[12883] trunk

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

Revision: 12883
          http://sourceforge.net/p/plplot/code/12883
Author:   airwin
Date:     2013-12-19 01:35:00 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Correctly handle rpath issues for builds of all wxwidgets-related PLplot
components.

Modified Paths:
--------------
    trunk/bindings/wxwidgets/CMakeLists.txt
    trunk/cmake/modules/wxwidgets.cmake

Modified: trunk/bindings/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/bindings/wxwidgets/CMakeLists.txt	2013-12-19 01:32:58 UTC (rev 12882)
+++ trunk/bindings/wxwidgets/CMakeLists.txt	2013-12-19 01:35:00 UTC (rev 12883)
@@ -89,6 +89,9 @@
 
   if(USE_RPATH)
     get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+    list(APPEND LIB_INSTALL_RPATH ${wxwidgets_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
+    
     set_target_properties(plplotwxwidgets${LIB_TAG}
       PROPERTIES
       SOVERSION ${plplotwxwidgets_SOVERSION}

Modified: trunk/cmake/modules/wxwidgets.cmake
===================================================================
--- trunk/cmake/modules/wxwidgets.cmake	2013-12-19 01:32:58 UTC (rev 12882)
+++ trunk/cmake/modules/wxwidgets.cmake	2013-12-19 01:35:00 UTC (rev 12883)
@@ -25,6 +25,8 @@
 # 			    device.
 # wxwidgets_LINK_FLAGS	  - list of full path names of libraries and
 # 			    linker flags for dynamic wxwidgets device driver.
+# wxwidgets_RPATH	  - rpath (if needed) for anything linked to the
+#                           wxwidgets libraries.
 # DRIVERS_LINK_FLAGS  	  - list of device LINK_FLAGS for case
 # 			    when ENABLE_DYNDRIVERS OFF.
 
@@ -84,6 +86,12 @@
   message(STATUS "wxWidgets found")
   message(STATUS "wxwidgets_COMPILE_FLAGS = ${wxwidgets_COMPILE_FLAGS}")
   message(STATUS "wxwidgets_LINK_FLAGS = ${wxwidgets_LINK_FLAGS}")
+  set(wxwidgets_RPATH ${wxWidgets_LIBRARY_DIRS})
+  filter_rpath(wxwidgets_RPATH)
+  if(wxwidgets_RPATH)
+    message(STATUS "wxwidgets_RPATH = ${wxwidgets_RPATH}")
+  endif(wxwidgets_RPATH)
+
   if(WITH_FREETYPE)
     include(agg)
     if(HAVE_AGG)

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

[Plplot-cvs] SF.net SVN: plplot:[12882] trunk/cmake/epa_build/wxwidgets/CMakeLists.txt

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

Revision: 12882
          http://sourceforge.net/p/plplot/code/12882
Author:   airwin
Date:     2013-12-19 01:32:58 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Try some different toolkit options for the wxwidgets build, but
ultimately none of those worked on Linux except for the gtk
toolkit that is the default (because the other cannot handle
the required (by PLplot) unicode capability).  So comment out the
toolkit options.

Modified Paths:
--------------
    trunk/cmake/epa_build/wxwidgets/CMakeLists.txt

Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2013-12-19 01:25:14 UTC (rev 12881)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt	2013-12-19 01:32:58 UTC (rev 12882)
@@ -41,6 +41,18 @@
   set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
 else(MSYS_PLATFORM)
   set(CXXFLAGS "$ENV{CXXFLAGS}")
+  # To avoid having to build all of gtk with epa_build in a consistent
+  # manner I tried several alternatives to the gtk toolkit.  
+  # e.g., 
+  # set(toolkit_options --with-x11)
+  # set(toolkit_options --with-motif)
+  # But neither of those worked because they are not capable of
+  # supplying the unicode (see --enable-unicode below) capability
+  # that is provided by the default gtk toolkit and needed by the
+  # PLplot build of the wxwidgets device.
+  # The inevitable conclusion is that on Unix, we must use the gtk toolkit
+  # and therefore epa_build must provide a consistent version of that
+  # as a dependency of wxwidgets.
 endif(MSYS_PLATFORM)
 
 set(CFLAGS "$ENV{CFLAGS}")
@@ -57,7 +69,7 @@
   build_${PACKAGE}
   URL ${URL}
   URL_MD5 ${URL_MD5}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb ${toolkit_options}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
   )

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

[Plplot-cvs] SF.net SVN: plplot:[12881] trunk/bindings/tk/tkMain.c

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

Revision: 12881
          http://sourceforge.net/p/plplot/code/12881
Author:   airwin
Date:     2013-12-19 01:25:14 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Comment out debug print statements that somehow got into a recent
commit.

Modified Paths:
--------------
    trunk/bindings/tk/tkMain.c

Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c	2013-12-19 00:46:00 UTC (rev 12880)
+++ trunk/bindings/tk/tkMain.c	2013-12-19 01:25:14 UTC (rev 12881)
@@ -204,7 +204,7 @@
     //
     // Parse command-line arguments.
     //
-    fprintf( stderr, "Before Tk_ParseArgv\n" );
+    //fprintf( stderr, "Before Tk_ParseArgv\n" );
 
     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
          != TCL_OK )
@@ -212,7 +212,7 @@
         fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
         exit( 1 );
     }
-    fprintf( stderr, "After Tk_ParseArgv\n" );
+    //fprintf( stderr, "After Tk_ParseArgv\n" );
     if ( name == NULL )
     {
         if ( fileName != NULL )
@@ -315,7 +315,7 @@
     // and "argv".  Also set the "geometry" variable from the geometry
     // specified on the command line.
     //
-    fprintf( stderr, "Before Tcl_Merge\n" );
+    //fprintf( stderr, "Before Tcl_Merge\n" );
 
     args = Tcl_Merge( argc - 1, ( CONST char * CONST * )argv + 1 );
     Tcl_SetVar( interp, "argv", args, TCL_GLOBAL_ONLY );
@@ -323,7 +323,7 @@
     sprintf( buf, "%d", argc - 1 );
     Tcl_SetVar( interp, "argc", buf, TCL_GLOBAL_ONLY );
 
-    fprintf( stderr, "After Tcl_Merge\n" );
+    //fprintf( stderr, "After Tcl_Merge\n" );
     if ( geometry != NULL )
     {
         Tcl_SetVar( interp, "geometry", geometry, TCL_GLOBAL_ONLY );
@@ -345,7 +345,7 @@
     //
     // Invoke application-specific initialization.
     //
-    fprintf( stderr, "Before AppInit\n" );
+    //fprintf( stderr, "Before AppInit\n" );
 
     if ( ( *AppInit )( interp ) != TCL_OK )
     {
@@ -369,7 +369,7 @@
     //
     // Process the startup script, if any.
     //
-    fprintf( stderr, "Before startup\n" );
+    //fprintf( stderr, "Before startup\n" );
 
     if ( script != NULL )
     {
@@ -384,7 +384,7 @@
     //
     // Invoke the script specified on the command line, if any.
     //
-    fprintf( stderr, "Before source\n" );
+    //fprintf( stderr, "Before source\n" );
 
     if ( fileName != NULL )
     {
@@ -448,7 +448,7 @@
     // are no windows left, Tk_MainLoop returns and we exit.
     //
 
-    fprintf( stderr, "Before Tk_MainLoop\n" );
+    //fprintf( stderr, "Before Tk_MainLoop\n" );
     Tk_MainLoop();
 
     //

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

[Plplot-cvs] SF.net SVN: plplot:[12880] trunk/README.release

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

Revision: 12880
          http://sourceforge.net/p/plplot/code/12880
Author:   airwin
Date:     2013-12-19 00:46:00 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Add descriptions of some (AWI, Andrew, and Phil) test results.  The
summary of Arjen's and Jerry's test results have not been included yet
since that description needs some editing from them.

Modified Paths:
--------------
    trunk/README.release

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2013-12-18 21:56:15 UTC (rev 12879)
+++ trunk/README.release	2013-12-19 00:46:00 UTC (rev 12880)
@@ -165,8 +165,66 @@
 
 2. Tests made for release 5.9.11
 
-None at this time.
+Note that "comprehensive tests" below refers to running
+scripts/comprehensive_test.sh in default mode (i.e., not dropping any
+tests).  For each of our three major configurations (shared
+libraries/dynamic devices, shared libraries/nondynamic devices, and
+static libraries/nondynamic devices) this test script runs ctest in
+the build tree and runs the test_noninteractive and test_interactive
+targets in the build tree, the installed examples tree configured with
+a CMake-based build system for the examples, and an installed examples
+tree configured with our traditional (Make + pkg-config) build system
+for the examples.
 
+2.1 Comprehensive tests were run for a complete system build
+environment on 64-bit Debian Wheezy Linux for AMD-64 hardware.
+
+2.2 Comprehensive tests were run for a limited (qt, cairo, wxwidgets,
+and octave PLplot components were dropped) epa_build environment on
+64-bit Debian Wheezy Linux for AMD-64 hardware.
+
+2.3 Comprehensive tests were run for an almost complete epa_build
+environment (only the wxwidgets and octave components of PLplot were
+dropped) on 64-bit Debian Wheezy Linux for AMD-64 hardware.
+
+2.4 Comprehensive tests were run for a limited (qt, cairo, wxwidgets,
+and octave PLplot components were dropped) epa_build environment for
+32-bit MinGW/MSYS/Wine for AMD-64 hardware.
+
+2.5 Fairly comprehensive tests (i.e., for the shared library/dynamic
+drivers case use the test_noninteractive and test_interactive targets
+in the build tree) were run for a complete system build environment on
+64-bit Debian unstable Linux for AMD-64 hardware.
+
+2.6 Fairly comprehensive tests (i.e., for the shared library/dynamic
+drivers case use the test_noninteractive and test_interactive targets
+in the build tree) were run for a complete system build environment on
+64-bit Ubuntu Saucy (13.10) Linux for AMD-64 hardware.
+
+2.7 Build tests and some limited run-time tests (checking a few things
+by hand) were run for the static libraries/nondynamic devices case for
+a limited build environment (most PLplot components dropped other than
+wxwidgets 2.8) for the Visual Studio 2008 IDE (with associated MSVC
+compiler) on 32-bit Windows 7 for AMD-64 hardware.  The "Visual Studio
+9 2008" generator yielded good results.  Only x86 builds were tested.
+
+2.8 Build tests and some limited run-time tests (checking a few things
+by hand) were run for the static libraries/nondynamic devices case for
+a limited build environment (most PLplot components dropped other than
+wxwidgets 3.0) for the Visual Studio 2012 IDE (with associated MSVC
+compiler) on Windows 8 for AMD-64 hardware.  Both x86 and x64 builds
+were tested.  The combination of "NMake Makefiles" generator and MSVC
+compiler yielded good build results if CMake patches (available at
+http://www.cmake.org/Bug/view.php?id=14587 and
+http://www.cmake.org/Bug/view.php?id=14642) to allow use of
+wxwidgets-3.0 were applied.  With those patches some run-time problems
+with the use of Plplot's wxWidgetsApp with wxWidgets 3.0 were observed
+in the examples, however plots embedded in wxWidgets apps seem to work
+fine.  The "Visual Studio 11" and "Visual Studio 11 Win64" generators
+had some additional issues which could be worked around but which
+nevertheless indicated there are some CMake bugs for those generators
+that need to be addressed.
+
 3. Changes relative to PLplot 5.9.10 (the previous development release)
 
 3.1 NUMERIC_INCLUDE_PATH ==> NUMPY_INCLUDE_PATH

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

[Plplot-cvs] SF.net SVN: plplot:[12879] trunk/drivers/tk.c

[<and...@us...>]

Revision: 12879
          http://sourceforge.net/p/plplot/code/12879
Author:   andrewross
Date:     2013-12-18 21:56:15 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
Cast pointer to (void *) in call to free to suppress gcc warning.

Modified Paths:
--------------
    trunk/drivers/tk.c

Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c	2013-12-18 21:53:52 UTC (rev 12878)
+++ trunk/drivers/tk.c	2013-12-18 21:56:15 UTC (rev 12879)
@@ -1558,11 +1558,11 @@
 
         if ( unlink( iodev->fileName ) == -1 )
             abort_session( pls, "Error removing fifo" );
-        free(iodev->fileName);
+        free( (void *) iodev->fileName);
         iodev->fileName = NULL;
         if ( rmdir( dirname ) == -1 )
             abort_session( pls, "Error removing temporary directory" );
-        free(dirname);
+        free( (void *) dirname);
     }
 
 // Create socket for data transfer to the plframe widget

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

[Plplot-cvs] SF.net SVN: plplot:[12878] trunk/drivers/tk.c

[<and...@us...>]

Revision: 12878
          http://sourceforge.net/p/plplot/code/12878
Author:   andrewross
Date:     2013-12-18 21:53:52 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
Fix failure to free memory in tk driver allocated by pl_create_tempfifo.

Modified Paths:
--------------
    trunk/drivers/tk.c

Modified: trunk/drivers/tk.c
===================================================================
--- trunk/drivers/tk.c	2013-12-18 02:14:25 UTC (rev 12877)
+++ trunk/drivers/tk.c	2013-12-18 21:53:52 UTC (rev 12878)
@@ -1558,8 +1558,11 @@
 
         if ( unlink( iodev->fileName ) == -1 )
             abort_session( pls, "Error removing fifo" );
+        free(iodev->fileName);
+        iodev->fileName = NULL;
         if ( rmdir( dirname ) == -1 )
             abort_session( pls, "Error removing temporary directory" );
+        free(dirname);
     }
 
 // Create socket for data transfer to the plframe widget

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

[Plplot-cvs] SF.net SVN: plplot:[12877] trunk/cmake/modules/plplot_functions.cmake

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

Revision: 12877
          http://sourceforge.net/p/plplot/code/12877
Author:   airwin
Date:     2013-12-18 02:14:25 +0000 (Wed, 18 Dec 2013)
Log Message:
-----------
Refine the filter_rpath function a little more by removing empty
elements from the rpath list.

Modified Paths:
--------------
    trunk/cmake/modules/plplot_functions.cmake

Modified: trunk/cmake/modules/plplot_functions.cmake
===================================================================
--- trunk/cmake/modules/plplot_functions.cmake	2013-12-17 22:45:28 UTC (rev 12876)
+++ trunk/cmake/modules/plplot_functions.cmake	2013-12-18 02:14:25 UTC (rev 12877)
@@ -201,7 +201,9 @@
   #message("DEBUG: ${rpath} = ${${rpath}}")
   set(internal_rpath ${${rpath}})
   if(internal_rpath)
+    # Remove duplicates and empty elements.
     list(REMOVE_DUPLICATES internal_rpath)
+    list(REMOVE_ITEM internal_rpath "")
     set(directories_to_be_removed
       ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
       ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}

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

[Plplot-cvs] SF.net SVN: plplot:[12876] trunk/examples/d/Makefile.examples.in

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

Revision: 12876
          http://sourceforge.net/p/plplot/code/12876
Author:   airwin
Date:     2013-12-17 22:45:28 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Separate the previous one-step traditional build of D examples into a
compile step and link step.  This reduces the amount of work per step
that gdc has to do and works around a bug in Debian Wheezy gdc which
sometimes segfaults otherwise.  The segfaults were consistently
observed (until this workaround was made) for the
ENABLE_DYNDRIVERS=OFF case for the epa_build environment where there
are both extensive compile flags and link flags. gdc did not segfault
for the traditional build for the epa_build environment when
ENABLE_DYNDRIVERS=ON (presumably because the compile flags and link
flags are much less extensive in that case).

Modified Paths:
--------------
    trunk/examples/d/Makefile.examples.in

Modified: trunk/examples/d/Makefile.examples.in
===================================================================
--- trunk/examples/d/Makefile.examples.in	2013-12-17 21:03:14 UTC (rev 12875)
+++ trunk/examples/d/Makefile.examples.in	2013-12-17 22:45:28 UTC (rev 12876)
@@ -64,9 +64,11 @@
 all: $(EXECUTABLES_list)
 
 clean:
-	rm -f $(EXECUTABLES_list)
+	rm -f $(EXECUTABLES_list) *.o
 
-.d$(EXEEXT):
-	$(DC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-d`
+.d.o:
+	$(DC) $< -c -o $@ `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags plplot$(LIB_TAG)-d`
+.o$(EXEEXT):
+	$(DC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --libs plplot$(LIB_TAG)-d`
 
-.SUFFIXES: .d $(EXEEXT)
+.SUFFIXES: .d .o $(EXEEXT)

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

[Plplot-cvs] SF.net SVN: plplot:[12875] trunk/bindings/tk/CMakeLists.txt

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

Revision: 12875
          http://sourceforge.net/p/plplot/code/12875
Author:   airwin
Date:     2013-12-17 21:03:14 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Fix an rpath issue for plserver

Modified Paths:
--------------
    trunk/bindings/tk/CMakeLists.txt

Modified: trunk/bindings/tk/CMakeLists.txt
===================================================================
--- trunk/bindings/tk/CMakeLists.txt	2013-12-17 05:32:16 UTC (rev 12874)
+++ trunk/bindings/tk/CMakeLists.txt	2013-12-17 21:03:14 UTC (rev 12875)
@@ -107,6 +107,8 @@
 
   if(USE_RPATH)
     get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+    list(APPEND LIB_INSTALL_RPATH ${TCL_TK_ITCL_ITK_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
     set_target_properties(plserver
       PROPERTIES
       INSTALL_RPATH "${LIB_INSTALL_RPATH}"

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

[Plplot-cvs] SF.net SVN: plplot:[12874] trunk/drivers

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

Revision: 12874
          http://sourceforge.net/p/plplot/code/12874
Author:   airwin
Date:     2013-12-17 05:32:16 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Turn cast from "const char *" to "char *" from implicit (which in the
psttf.cc case ended up as a build error) to explicit form.  This build
error was found as a result of running the comprehensive_test.sh
script, but as far as I can tell nothing was changed for psttf.cc from
when this script ran without errors not that long ago for exactly
the same (normal build as opposed to epa_build) environment.  So I
do not have a clue why we suddenly have this build error, but I
have now fixed it with the explicit casts.

Modified Paths:
--------------
    trunk/drivers/ps.c
    trunk/drivers/psttf.cc

Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c	2013-12-17 01:27:14 UTC (rev 12873)
+++ trunk/drivers/ps.c	2013-12-17 05:32:16 UTC (rev 12874)
@@ -94,8 +94,8 @@
                                      int type, int seq, plD_init_fp init )
 {
 #ifndef ENABLE_DYNDRIVERS
-    pdt->pl_MenuStr = menustr;
-    pdt->pl_DevName = devnam;
+    pdt->pl_MenuStr = (char *) menustr;
+    pdt->pl_DevName = (char *) devnam;
 #else
     (void) menustr;   // Cast to void to silence compiler warnings about unused parameters
     (void) devnam;

Modified: trunk/drivers/psttf.cc
===================================================================
--- trunk/drivers/psttf.cc	2013-12-17 01:27:14 UTC (rev 12873)
+++ trunk/drivers/psttf.cc	2013-12-17 05:32:16 UTC (rev 12874)
@@ -125,8 +125,8 @@
                                         int type, int seq, plD_init_fp init )
 {
 #ifndef ENABLE_DYNDRIVERS
-    pdt->pl_MenuStr = menustr;
-    pdt->pl_DevName = devnam;
+    pdt->pl_MenuStr = (char *) menustr;
+    pdt->pl_DevName = (char *) devnam;
 #else
     (void) menustr;   // Cast to void to silence compiler warnings about unused parameters
     (void) devnam;

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

[Plplot-cvs] SF.net SVN: plplot:[12873] trunk

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

Revision: 12873
          http://sourceforge.net/p/plplot/code/12873
Author:   airwin
Date:     2013-12-17 01:27:14 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Style previous commits.

Modified Paths:
--------------
    trunk/bindings/tcl/tclAPI.c
    trunk/bindings/tk/plframe.c
    trunk/bindings/tk/pltkd.h
    trunk/bindings/tk/tcpip.c
    trunk/bindings/tk/tkMain.c
    trunk/drivers/pdf.c
    trunk/examples/c/x04c.c
    trunk/examples/c++/x31.cc
    trunk/src/plctrl.c
    trunk/src/pllegend.c

Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/bindings/tcl/tclAPI.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -695,7 +695,7 @@
 int
 pls_auto_path( Tcl_Interp *interp )
 {
-    int         debug        = plsc->debug;
+    int  debug = plsc->debug;
     char *buf, *ptr = NULL, *dn;
     int  return_code = TCL_OK;
 #ifdef DEBUG
@@ -707,7 +707,7 @@
 // Add TCL_DIR
 
 #ifdef TCL_DIR
-    if( debug )
+    if ( debug )
         fprintf( stderr, "adding %s to auto_path\n", TCL_DIR );
     Tcl_SetVar( interp, "dir", TCL_DIR, TCL_GLOBAL_ONLY );
     if ( tcl_cmd( interp, "set auto_path [linsert $auto_path 0 $dir]" ) == TCL_ERROR )

Modified: trunk/bindings/tk/plframe.c
===================================================================
--- trunk/bindings/tk/plframe.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/bindings/tk/plframe.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -1195,8 +1195,8 @@
 
     dbug_enter( "PlFrameKeyEH" );
 
-#if !defined( __WIN32__ )
-    nchars         = XLookupString( event, string, 10, &keysym, &cs );
+#if !defined ( __WIN32__ )
+    nchars = XLookupString( event, string, 10, &keysym, &cs );
 #else
     nchars = 0;
 #endif
@@ -2548,7 +2548,7 @@
                 (char *) NULL );
             return TCL_ERROR;
         }
-#if !defined( __WIN32__ )
+#if !defined ( __WIN32__ )
         if ( ( iodev->fd = open( argv[1], O_RDONLY ) ) == -1 )
 #else
         if ( 1 )
@@ -2560,10 +2560,10 @@
         }
         iodev->type     = 0;
         iodev->typeName = "fifo";
-#if !defined( __WIN32__ )
-        iodev->file     = fdopen( iodev->fd, "rb" );
+#if !defined ( __WIN32__ )
+        iodev->file = fdopen( iodev->fd, "rb" );
 #else
-        iodev->file     = NULL;
+        iodev->file = NULL;
 #endif
     }
 
@@ -2875,7 +2875,7 @@
     if ( plFramePtr->plpr_cmd == NULL )
         plFramePtr->plpr_cmd = plFindCommand( "plpr" );
 
-#if !defined( __WIN32__ )
+#if !defined ( __WIN32__ )
     if ( ( plFramePtr->plpr_cmd == NULL ) || ( pid = fork() ) < 0 )
 #else
     if ( 1 )
@@ -2888,7 +2888,7 @@
     }
     else if ( pid == 0 )
     {
-#if !defined( __WIN32__ )
+#if !defined ( __WIN32__ )
         if ( execl( plFramePtr->plpr_cmd, plFramePtr->plpr_cmd, sfnam,
                  (char *) 0 ) )
 #else

Modified: trunk/bindings/tk/pltkd.h
===================================================================
--- trunk/bindings/tk/pltkd.h	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/bindings/tk/pltkd.h	2013-12-17 01:27:14 UTC (rev 12873)
@@ -22,8 +22,8 @@
 #endif
 
 // Define the type pid_t - a dummy for the moment - for MS Windows
-#if defined(__WIN32__)
-typedef unsigned int pid_t;
+#if defined ( __WIN32__ )
+typedef unsigned int   pid_t;
 #endif
 
 // One of these holds the TK driver state information

Modified: trunk/bindings/tk/tcpip.c
===================================================================
--- trunk/bindings/tk/tcpip.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/bindings/tk/tcpip.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -105,16 +105,16 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
-#if !defined( __WIN32__ )
+#if !defined ( __WIN32__ )
 #include <sys/uio.h>
 #endif
 #include <errno.h>
 
 // Supply dummy macros for the low-level I/O functions - Windows
-#if defined( __WIN32__ )
-#define read(a,b,c) 0
-#define close(a)
-#define write(a,b,c) 0
+#if defined ( __WIN32__ )
+#define read( a, b, c )     0
+#define close( a )
+#define write( a, b, c )    0
 #endif
 
 //extern int errno;

Modified: trunk/bindings/tk/tkMain.c
===================================================================
--- trunk/bindings/tk/tkMain.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/bindings/tk/tkMain.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -108,11 +108,11 @@
 // extern int		isatty _ANSI_ARGS_((int fd));
 // extern int		read _ANSI_ARGS_((int fd, char *buf, size_t size));
 //
-#if !defined(__WIN32__)
+#if !defined ( __WIN32__ )
 extern char *           strrchr _ANSI_ARGS_( ( CONST char *string, int c ) );
 #else
 // On Windows we do not have a convenient console to work with
-#define isatty( a ) 0
+#define isatty( a )    0
 #endif
 
 //
@@ -204,7 +204,7 @@
     //
     // Parse command-line arguments.
     //
-    fprintf( stderr, "Before Tk_ParseArgv\n");
+    fprintf( stderr, "Before Tk_ParseArgv\n" );
 
     if ( Tk_ParseArgv( interp, (Tk_Window) NULL, &argc, argv, argTable, 0 )
          != TCL_OK )
@@ -212,7 +212,7 @@
         fprintf( stderr, "%s\n", Tcl_GetStringResult( interp ) );
         exit( 1 );
     }
-    fprintf( stderr, "After Tk_ParseArgv\n");
+    fprintf( stderr, "After Tk_ParseArgv\n" );
     if ( name == NULL )
     {
         if ( fileName != NULL )
@@ -315,7 +315,7 @@
     // and "argv".  Also set the "geometry" variable from the geometry
     // specified on the command line.
     //
-    fprintf( stderr, "Before Tcl_Merge\n");
+    fprintf( stderr, "Before Tcl_Merge\n" );
 
     args = Tcl_Merge( argc - 1, ( CONST char * CONST * )argv + 1 );
     Tcl_SetVar( interp, "argv", args, TCL_GLOBAL_ONLY );
@@ -323,7 +323,7 @@
     sprintf( buf, "%d", argc - 1 );
     Tcl_SetVar( interp, "argc", buf, TCL_GLOBAL_ONLY );
 
-    fprintf( stderr, "After Tcl_Merge\n");
+    fprintf( stderr, "After Tcl_Merge\n" );
     if ( geometry != NULL )
     {
         Tcl_SetVar( interp, "geometry", geometry, TCL_GLOBAL_ONLY );
@@ -345,7 +345,7 @@
     //
     // Invoke application-specific initialization.
     //
-    fprintf( stderr, "Before AppInit\n");
+    fprintf( stderr, "Before AppInit\n" );
 
     if ( ( *AppInit )( interp ) != TCL_OK )
     {
@@ -369,7 +369,7 @@
     //
     // Process the startup script, if any.
     //
-    fprintf( stderr, "Before startup\n");
+    fprintf( stderr, "Before startup\n" );
 
     if ( script != NULL )
     {
@@ -384,7 +384,7 @@
     //
     // Invoke the script specified on the command line, if any.
     //
-    fprintf( stderr, "Before source\n");
+    fprintf( stderr, "Before source\n" );
 
     if ( fileName != NULL )
     {
@@ -448,7 +448,7 @@
     // are no windows left, Tk_MainLoop returns and we exit.
     //
 
-    fprintf( stderr, "Before Tk_MainLoop\n");
+    fprintf( stderr, "Before Tk_MainLoop\n" );
     Tk_MainLoop();
 
     //
@@ -502,10 +502,10 @@
     int        code, count;
     const char *res;
 
-#if !defined(__WIN32__)
+#if !defined ( __WIN32__ )
     count = (int) read( fileno( stdin ), input, BUFFER_SIZE );
 #else
-    count = fread( input, BUFFER_SIZE, sizeof( char ), stdin );
+    count = fread( input, BUFFER_SIZE, sizeof ( char ), stdin );
 #endif
     if ( count <= 0 )
     {

Modified: trunk/drivers/pdf.c
===================================================================
--- trunk/drivers/pdf.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/drivers/pdf.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -750,7 +750,7 @@
                     dup            = 0.5 * ( 1.0 - sscale );
                     dev->fontScale = (HPDF_REAL) sscale;
                     PSSetFont( dev, fci );
-                    dev->yOffset = (HPDF_REAL) (dev->fontSize * ( soffset * RISE_FACTOR + dup ));
+                    dev->yOffset = (HPDF_REAL) ( dev->fontSize * ( soffset * RISE_FACTOR + dup ) );
                 }
                 if ( ucs4[i] == (PLUNICODE) 'd' ) // Subscript
                 {

Modified: trunk/examples/c/x04c.c
===================================================================
--- trunk/examples/c/x04c.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/examples/c/x04c.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -125,8 +125,8 @@
     line_styles[0] = 1;
     line_widths[0] = 1.;
     // note from the above opt_array the first symbol (and box) indices
-    // do not have to be specified, at least in C. For Fortran we need 
-    // to set the symbols to be something, since the string is always 
+    // do not have to be specified, at least in C. For Fortran we need
+    // to set the symbols to be something, since the string is always
     // copied as part of the bindings.
     symbols[0] = "";
 

Modified: trunk/examples/c++/x31.cc
===================================================================
--- trunk/examples/c++/x31.cc	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/examples/c++/x31.cc	2013-12-17 01:27:14 UTC (rev 12873)
@@ -288,7 +288,6 @@
     }
 
     delete pls;
-
 }
 
 int main( int argc, const char **argv )

Modified: trunk/src/plctrl.c
===================================================================
--- trunk/src/plctrl.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/src/plctrl.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -698,11 +698,11 @@
         if ( alt_hue_path == NULL )
             plsc->cmap1cp[n].alt_hue_path = 0;
         else
-            if ( n != npts-1 )
-                plsc->cmap1cp[n].alt_hue_path = alt_hue_path[n];
-            else
-                // Note final element is unused, so we set to zero for completeness.
-                plsc->cmap1cp[n].alt_hue_path = 0;
+        if ( n != npts - 1 )
+            plsc->cmap1cp[n].alt_hue_path = alt_hue_path[n];
+        else
+            // Note final element is unused, so we set to zero for completeness.
+            plsc->cmap1cp[n].alt_hue_path = 0;
     }
 
 // Calculate and set color map
@@ -784,11 +784,11 @@
         if ( alt_hue_path == NULL )
             plsc->cmap1cp[n].alt_hue_path = 0;
         else
-            if ( n != npts-1 )
-                plsc->cmap1cp[n].alt_hue_path = alt_hue_path[n];
-            else
-                // Note final element is unused, so we set to zero for completeness.
-                plsc->cmap1cp[n].alt_hue_path = 0;
+        if ( n != npts - 1 )
+            plsc->cmap1cp[n].alt_hue_path = alt_hue_path[n];
+        else
+            // Note final element is unused, so we set to zero for completeness.
+            plsc->cmap1cp[n].alt_hue_path = 0;
     }
 
 // Calculate and set color map
@@ -1726,7 +1726,7 @@
             fuzzy_range_check( g[i], 0., 1., FUZZ_EPSILON, 2 );
             fuzzy_range_check( b[i], 0., 1., FUZZ_EPSILON, 3 );
             fuzzy_range_check( pos[i], 0., 1., FUZZ_EPSILON, 4 );
-            if ( ( return_sscanf == 5 )  && ( i != number_colors - 1 ) )
+            if ( ( return_sscanf == 5 ) && ( i != number_colors - 1 ) )
             {
                 // Next to oldest tk format with alt_hue_path specified.
                 alt_hue_path[i] = (PLBOOL) alt_hue_path_i;

Modified: trunk/src/pllegend.c
===================================================================
--- trunk/src/pllegend.c	2013-12-17 01:25:27 UTC (rev 12872)
+++ trunk/src/pllegend.c	2013-12-17 01:27:14 UTC (rev 12873)
@@ -933,14 +933,14 @@
 static void
 remove_characters( char *string, const char *characters )
 {
-    char *src, *dst; 
+    char       *src, *dst;
     const char *ptr;
-    for(src=dst=string; *src != '\0'; src++) 
+    for ( src = dst = string; *src != '\0'; src++ )
     {
         ptr = characters;
-        while ( (*ptr != '\0') && (*src != *ptr) )
+        while ( ( *ptr != '\0' ) && ( *src != *ptr ) )
             ptr++;
-        if (*src != *ptr) 
+        if ( *src != *ptr )
         {
             *dst = *src;
             dst++;

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

[Plplot-cvs] SF.net SVN: plplot:[12872] trunk

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

Revision: 12872
          http://sourceforge.net/p/plplot/code/12872
Author:   airwin
Date:     2013-12-17 01:25:27 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Many rpath fixups for the case where Tcl/Tk is not installed in a
system location.

Modified Paths:
--------------
    trunk/bindings/tcl/CMakeLists.txt
    trunk/cmake/modules/tcl-related.cmake
    trunk/cmake/modules/tk.cmake
    trunk/examples/CMakeLists.txt
    trunk/examples/tk/Makefile.examples.in
    trunk/src/CMakeLists.txt

Modified: trunk/bindings/tcl/CMakeLists.txt
===================================================================
--- trunk/bindings/tcl/CMakeLists.txt	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/bindings/tcl/CMakeLists.txt	2013-12-17 01:25:27 UTC (rev 12872)
@@ -74,7 +74,8 @@
   endif(USE_TCL_TK_STUBS)
 
   if(USE_RPATH)
-    set(LIB_INSTALL_RPATH ${LIB_DIR})
+    set(LIB_INSTALL_RPATH ${LIB_DIR} ${TCL_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
     set_target_properties(tclmatrix${LIB_TAG}
       PROPERTIES
       SOVERSION ${tclmatrix_SOVERSION}
@@ -360,6 +361,8 @@
 
   if(USE_RPATH)
     get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+    list(APPEND LIB_INSTALL_RPATH ${TCL_TK_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
     set_target_properties(plplottcltk${LIB_TAG}
       PROPERTIES
       SOVERSION ${plplottcltk_SOVERSION}
@@ -368,6 +371,9 @@
       INSTALL_NAME_DIR "${LIB_DIR}"
       )
 
+    # This version of LIB_INSTALL_RPATH also used below for pltcl.
+    list(APPEND LIB_INSTALL_RPATH ${TCL_TK_ITCL_ITK_RPATH})
+    filter_rpath(LIB_INSTALL_RPATH)
     set_target_properties(plplottcltk_Main${LIB_TAG}
       PROPERTIES
       SOVERSION ${plplottcltk_Main_SOVERSION}

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/cmake/modules/tcl-related.cmake	2013-12-17 01:25:27 UTC (rev 12872)
@@ -41,27 +41,31 @@
 # further.
 
 #TCL_INCLUDE_PATH
-#TCL_LIBRARY            (Always the non-stub version)
-#TCL_STUB_LIBRARY       (Always the stub version)
+#TCL_LIBRARY             (Always the non-stub version)
+#TCL_STUB_LIBRARY        (Always the stub version)
 #ITCL_INCLUDE_PATH
 #ITCL_LIBRARY
-#HAVE_ITCL   		(On when itcl header and library have been found.
-#			 Otherwise, undefined.
-#			 Used for source file configuration.)
-#HAVE_ITCLDECLS_H 	(defined [actually as a path, but we don't use that]
-#			 when itclDecls.h.  Otherwise, undefined.
-#			 Used for source file configuration.)
+#HAVE_ITCL               (On when itcl header and library have been found.
+#			  Otherwise, undefined.
+#			  Used for source file configuration.)
+#HAVE_ITCLDECLS_H 	 (defined [actually as a path, but we don't use that]
+#			  when itclDecls.h.  Otherwise, undefined.
+#			  Used for source file configuration.)
 #TK_INCLUDE_PATH
-#TK_LIBRARY             (Always the non-stub version)
-#TK_STUB_LIBRARY        (Always the stub version)
+#TK_LIBRARY              (Always the non-stub version)
+#TK_STUB_LIBRARY         (Always the stub version)
 #ITK_INCLUDE_PATH
 #ITK_LIBRARY
-#HAVE_ITK   		(On when itcl header and library have been found.
-#			 Otherwise, undefined.
-#			 Used for source file configuration.)
+#HAVE_ITK   		 (On when itcl header and library have been found.
+#			  Otherwise, undefined.
+#			  Used for source file configuration.)
 #PLPLOT_ITCL_VERSION     (Consistent Itcl version number found by PLplot).
 #PLPLOT_ITK_VERSION      (Consistent Itk version number found by PLplot).
 #PLPLOT_IWIDGETS_VERSION (Consistent Iwidgets version number found by PLplot).
+#TCL_RPATH               (rpath, if needed for non-system Tcl location)
+#TCL_TK_RPATH            (rpath, if needed for non-system Tcl/Tk location)
+#TCL_TK_ITCL_ITK_RPATH   (rpath, if needed for non-system Tcl/Tk/Itcl/Itk
+#                         location)
 
 if(ENABLE_tcl)
   message(STATUS "Start determining consistent system data for Tcl and friends")
@@ -74,6 +78,9 @@
 
     get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
     message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
+    set(TCL_RPATH ${TCL_LIBRARY_PATH})
+    set(TCL_TK_RPATH ${TCL_RPATH})
+    set(TCL_TK_ITCL_ITK_RPATH ${TCL_RPATH})
 
     if(TCL_TCLSH)
       message(STATUS "Looking for tclsh - found")
@@ -172,6 +179,8 @@
           if(ITCL_LIBRARY)
             message(STATUS "Looking for itcl library - found")
 	    message(STATUS "ITCL_LIBRARY = ${ITCL_LIBRARY}")
+	    get_filename_component(ITCL_LIBRARY_PATH ${ITCL_LIBRARY} PATH)
+	    list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITCL_LIBRARY_PATH})
             set(HAVE_ITCL ON)
             find_path(HAVE_ITCLDECLS_H itclDecls.h HINTS ${ITCL_INCLUDE_PATH})
           else(ITCL_LIBRARY)
@@ -215,6 +224,8 @@
       if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
 	message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
       endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+      list(APPEND TCL_TK_RPATH  ${TK_LIBRARY_PATH})
+      list(APPEND TCL_TK_ITCL_ITK_RPATH  ${TK_LIBRARY_PATH})
     else(ENABLE_tk)
       message(STATUS "WARNING: Because Tk is disabled must disable Itk as well")
       set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE)
@@ -305,6 +316,8 @@
             message(STATUS "Looking for itk library - found")
 	    message(STATUS "ITK_LIBRARY = ${ITK_LIBRARY}")
 	    set(HAVE_ITK ON)
+	    get_filename_component(ITK_LIBRARY_PATH ${ITK_LIBRARY} PATH)
+	    list(APPEND TCL_TK_ITCL_ITK_RPATH ${ITK_LIBRARY_PATH})
 
 	    # Test version consistency between iwidgets, itk, and itcl.
 	    if(NOT IWIDGETS_VERSIONS_LIST)
@@ -412,6 +425,22 @@
     set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
     set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE)
   endif(TCL_FOUND AND TCL_TCLSH)
+
+  filter_rpath(TCL_RPATH)
+  if(TCL_RPATH)
+    message(STATUS "TCL_RPATH = ${TCL_RPATH}")
+  endif(TCL_RPATH)
+
+  filter_rpath(TCL_TK_RPATH)
+  if(TCL_TK_RPATH)
+    message(STATUS "TCL_TK_RPATH = ${TCL_TK_RPATH}")
+  endif(TCL_TK_RPATH)
+
+  filter_rpath(TCL_TK_ITCL_ITK_RPATH)
+  if(TCL_TK_ITCL_ITK_RPATH)
+    message(STATUS "TCL_TK_ITCL_ITK_RPATH = ${TCL_TK_ITCL_ITK_RPATH}")
+  endif(TCL_TK_ITCL_ITK_RPATH)
+
   message(STATUS "Finished determining consistent system data for Tcl and friends")
 else(ENABLE_tcl)
   message(STATUS "WARNING: ENABLE_tcl is OFF so disabling everything else that is Tcl/Tk related")

Modified: trunk/cmake/modules/tk.cmake
===================================================================
--- trunk/cmake/modules/tk.cmake	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/cmake/modules/tk.cmake	2013-12-17 01:25:27 UTC (rev 12872)
@@ -25,6 +25,7 @@
 # tk_COMPILE_FLAGS	  - individual COMPILE_FLAGS required to compile
 # 			    the tk device.
 # tk_LINK_FLAGS	  	  - individual LINK_FLAGS for the dynamic tk device.
+# tk_RPATH                - rpath for tk device driver.
 # DRIVERS_LINK_FLAGS	  - list of LINK_FLAGS for all static devices.
 # tk_SOURCE		  - list of source files other than tk.c
 
@@ -33,6 +34,7 @@
 # ntk_COMPILE_FLAGS	  - individual COMPILE_FLAGS required to compile
 # 			    the ntk device.
 # ntk_LINK_FLAGS	  - individual LINK_FLAGS for the dynamic ntk device.
+# ntk_RPATH               - rpath for ntk device driver.
 # DRIVERS_LINK_FLAGS	  - list of LINK_FLAGS for all static devices.
 
 # The following variables are set/modified for the tkwin device:
@@ -40,6 +42,7 @@
 # tkwin_COMPILE_FLAGS	  - individual COMPILE_FLAGS required to compile
 # 			    the tkwin device.
 # tkwin_LINK_FLAGS	  - individual LINK_FLAGS for the dynamic tkwin device.
+# tkwin_RPATH             - rpath for tkwin device driver.
 # DRIVERS_LINK_FLAGS	  - list of LINK_FLAGS for all static devices.
 # tkwin_SOURCE		  - list of source files other than tkwin.c
 
@@ -62,6 +65,7 @@
   "-I${TCL_INCLUDE_PATH} ${TKLIB_COMPILE_FLAGS} -I\"${CMAKE_SOURCE_DIR}\"/bindings/tcl -I\"${CMAKE_BINARY_DIR}\"/bindings/tcl -I\"${CMAKE_SOURCE_DIR}\"/bindings/tk"
   )
   set(tk_LINK_FLAGS plplottcltk${LIB_TAG} ${TCL_LIBRARY} ${TK_LIBRARY})
+  set(tk_RPATH ${TCL_TK_RPATH})
   set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${TCL_LIBRARY} ${TK_LIBRARY})
   if(NOT ENABLE_DYNDRIVERS)
     # All source that is in libplplottcltk
@@ -98,6 +102,7 @@
 if(PLD_ntk)
   set(ntk_COMPILE_FLAGS "-I${TCL_INCLUDE_PATH} ${TKLIB_COMPILE_FLAGS}")
   set(ntk_LINK_FLAGS ${TCL_LIBRARY} ${TK_LIBRARY})
+  set(ntk_RPATH ${TCL_TK_RPATH})
   set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${ntk_LINK_FLAGS})
 endif(PLD_ntk)
 
@@ -108,8 +113,11 @@
 
   if(USE_TCL_TK_STUBS)
     set(tkwin_LINK_FLAGS plplottcltk${LIB_TAG} ${TCL_STUB_LIBRARY} ${TK_STUB_LIBRARY} ${X11_LIBRARIES})
+    # tkwin_RPATH should be undefined for this case since stubs versions
+    # of the libraries are static (in my experience so far).
   else(USE_TCL_TK_STUBS)
     set(tkwin_LINK_FLAGS plplottcltk${LIB_TAG} ${TCL_LIBRARY} ${TK_LIBRARY} ${X11_LIBRARIES})
+    set(tkwin_RPATH ${TCL_TK_RPATH})
   endif(USE_TCL_TK_STUBS)
 
   set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${TCL_LIBRARY} ${TK_LIBRARY})

Modified: trunk/examples/CMakeLists.txt
===================================================================
--- trunk/examples/CMakeLists.txt	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/examples/CMakeLists.txt	2013-12-17 01:25:27 UTC (rev 12872)
@@ -211,17 +211,37 @@
   # */Makefiles configured in each * subdirectory from */Makefile.examples.in.
   if(USE_RPATH)
     get_target_property(_LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
-    string(REGEX REPLACE ";" ":" LIB_INSTALL_RPATH "${_LIB_INSTALL_RPATH}")
-    set(RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}")
-    if(PLD_extqt)
-      if(ENABLE_DYNDRIVERS)
-	get_target_property(_qt_INSTALL_RPATH qt INSTALL_RPATH)
-	string(REGEX REPLACE ";" ":" qt_INSTALL_RPATH "${_qt_INSTALL_RPATH}")
-	set(qt_RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}:${qt_INSTALL_RPATH}:${DRV_DIR}")
-      else(ENABLE_DYNDRIVERS)
-	set(qt_RPATHCMD ${RPATHCMD})
-      endif(ENABLE_DYNDRIVERS)
-    endif(PLD_extqt)
+    if(_LIB_INSTALL_RPATH)
+      string(REGEX REPLACE ";" ":" LIB_INSTALL_RPATH "${_LIB_INSTALL_RPATH}")
+      set(RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}")
+      if(PLD_extqt)
+	if(ENABLE_DYNDRIVERS)
+	  get_target_property(_qt_INSTALL_RPATH qt INSTALL_RPATH)
+	  if(_qt_INSTALL_RPATH)
+	    string(REGEX REPLACE ";" ":" qt_INSTALL_RPATH "${_qt_INSTALL_RPATH}")
+	    set(qt_RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}:${qt_INSTALL_RPATH}:${DRV_DIR}")
+	  else(_qt_INSTALL_RPATH)
+	    set(qt_RPATHCMD)
+	  endif(_qt_INSTALL_RPATH)
+	else(ENABLE_DYNDRIVERS)
+	  set(qt_RPATHCMD ${RPATHCMD})
+	endif(ENABLE_DYNDRIVERS)
+      endif(PLD_extqt)
+      if(ENABLE_tcl)
+	get_target_property(_plplottcltk_Main_INSTALL_RPATH plplottcltk_Main${LIB_TAG} INSTALL_RPATH)
+	if(_plplottcltk_Main_INSTALL_RPATH)
+	  string(REGEX REPLACE ";" ":" plplottcltk_Main_INSTALL_RPATH "${_plplottcltk_Main_INSTALL_RPATH}")
+	  set(plplottcltk_Main_RPATHCMD "-Wl,-rpath -Wl,${LIB_INSTALL_RPATH}:${plplottcltk_Main_INSTALL_RPATH}")
+	else(_plplottcltk_Main_INSTALL_RPATH)
+	  set(plplottcltk_Main_RPATHCMD)
+	endif(_plplottcltk_Main_INSTALL_RPATH)
+      endif(ENABLE_tcl)
+    else(_LIB_INSTALL_RPATH)
+      set(RPATHCMD)
+      set(qt_RPATHCMD)
+      set(plplottcltk_Main_RPATHCMD)
+    endif(_LIB_INSTALL_RPATH)
+    
   endif(USE_RPATH)
 
   # Install lena.pgm in installed examples directory so that all implementations

Modified: trunk/examples/tk/Makefile.examples.in
===================================================================
--- trunk/examples/tk/Makefile.examples.in	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/examples/tk/Makefile.examples.in	2013-12-17 01:25:27 UTC (rev 12872)
@@ -25,7 +25,7 @@
 
 LIB_TAG = @LIB_TAG@
 PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-RPATHCMD = @RPATHCMD@
+plplottcltk_Main_RPATHCMD = @plplottcltk_Main_RPATHCMD@
 
 EXECUTABLES_list = xtk01$(EXEEXT)
 # Second and fourth examples depend on itk.
@@ -37,6 +37,6 @@
 	rm -f $(EXECUTABLES_list) $(itk_EXECUTABLES_list)
 
 .c$(EXEEXT):
-	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl_Main plplot$(LIB_TAG)-tcl plplot$(LIB_TAG)` -lm
+	$(CC) $< -o $@ $(plplottcltk_Main_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config @PC_STATIC_OPTION@ --cflags --libs plplot$(LIB_TAG)-tcl_Main plplot$(LIB_TAG)-tcl plplot$(LIB_TAG)` -lm
 
 .SUFFIXES: .c $(EXEEXT)

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2013-12-17 01:18:23 UTC (rev 12871)
+++ trunk/src/CMakeLists.txt	2013-12-17 01:25:27 UTC (rev 12872)
@@ -417,6 +417,7 @@
   )
 
 if(USE_RPATH)
+  filter_rpath(LIB_INSTALL_RPATH)
   set_target_properties(
     plplot${LIB_TAG}
     PROPERTIES 

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

[Plplot-cvs] SF.net SVN: plplot:[12871] trunk/cmake/epa_build/setup/setup_linux

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

Revision: 12871
          http://sourceforge.net/p/plplot/code/12871
Author:   airwin
Date:     2013-12-17 01:18:23 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Drop setting LD_LIBRARY_PATH since this is no longer necessary
to deal with the epa_build swig/libpcre case.

Modified Paths:
--------------
    trunk/cmake/epa_build/setup/setup_linux

Modified: trunk/cmake/epa_build/setup/setup_linux
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux	2013-12-17 01:15:22 UTC (rev 12870)
+++ trunk/cmake/epa_build/setup/setup_linux	2013-12-17 01:18:23 UTC (rev 12871)
@@ -45,10 +45,6 @@
 CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
 CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
 
-# Put buildtools on LD_LIBRARY_PATH.  This is necessary for at least swig
-# build tool to find libpcre library that is part of the buildtools.
-export LD_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib
-
 # Put buildtools pkg-config directories at top of PKG_CONFIG_PATH
 export PKG_CONFIG_PATH=${INSTALL_PREFIX}_buildtools/share/pkgconfig:${INSTALL_PREFIX}_buildtools/lib/pkgconfig
 

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

[Plplot-cvs] SF.net SVN: plplot:[12870] trunk/cmake/epa_build/swig/CMakeLists.txt

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

Revision: 12870
          http://sourceforge.net/p/plplot/code/12870
Author:   airwin
Date:     2013-12-17 01:15:22 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
Set rpath so that when the epa_build version of swig is loaded by the
run-time loader, the epa_build version of libpcre is found.

Modified Paths:
--------------
    trunk/cmake/epa_build/swig/CMakeLists.txt

Modified: trunk/cmake/epa_build/swig/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/swig/CMakeLists.txt	2013-12-16 23:51:43 UTC (rev 12869)
+++ trunk/cmake/epa_build/swig/CMakeLists.txt	2013-12-17 01:15:22 UTC (rev 12870)
@@ -68,7 +68,7 @@
   DEPENDS ${dependencies_targets}
   URL ${URL}
   URL_HASH ${DOWNLOAD_HASH_TYPE}=${DOWNLOAD_HASH}
-  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
+  CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" "LDFLAGS=-Wl,-rpath -Wl,${EPA_CMAKE_INSTALL_PREFIX}/lib" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --with-pcre-prefix=${EPA_CMAKE_INSTALL_PREFIX}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} 
   BUILD_IN_SOURCE OFF
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}  install

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

[Plplot-cvs] SF.net SVN: plplot:[12869] trunk/cmake/modules/plplot.cmake

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

Revision: 12869
          http://sourceforge.net/p/plplot/code/12869
Author:   airwin
Date:     2013-12-16 23:51:43 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
Tweak commentary concerning placement of certain includes which use
the filter_rpath function which depends on languages being defined.

Modified Paths:
--------------
    trunk/cmake/modules/plplot.cmake

Modified: trunk/cmake/modules/plplot.cmake
===================================================================
--- trunk/cmake/modules/plplot.cmake	2013-12-16 00:14:36 UTC (rev 12868)
+++ trunk/cmake/modules/plplot.cmake	2013-12-16 23:51:43 UTC (rev 12869)
@@ -464,6 +464,7 @@
 include(java)
 include(python)
 include(octave)
+# tcl-related must come after c++ and fortran because of use of filter_rpath
 include(tcl-related)
 include(pdl)
 include(ada)
@@ -509,6 +510,7 @@
 # =======================================================================
 # additional library support
 # =======================================================================
+# shapelib must come after c++ and fortran because of use of filter_rpath
 # Support for shapelib library for reading shapefile map data
 include(shapelib)
 include(freetype)
@@ -520,7 +522,8 @@
     message(FATAL_ERROR "Cannot find required math library")
   endif(NOT MATH_LIB)
 endif(NOT WIN32_OR_CYGWIN)
-# Must come after MATH_LIB is defined (or not).
+# csiro must come after MATH_LIB is defined (or not).
+# csiro must come after c++ and fortran because of use of filter_rpath
 include(csiro)
 
 
@@ -532,6 +535,7 @@
 # =======================================================================
 # Device drivers
 # =======================================================================
+# drivers must come after c++ and fortran because of use of filter_rpath
 include(drivers)
 
 # =======================================================================

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

[Plplot-cvs] SF.net SVN: plplot:[12868] trunk/cmake/epa_build

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

Revision: 12868
          http://sourceforge.net/p/plplot/code/12868
Author:   airwin
Date:     2013-12-16 00:14:36 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
Add the ENABLE_COMPREHENSIVE_PLPLOT_TEST option to epa_build which
runs the PLplot comprehensive test script for the exact same build
environment (i.e., cmake options, environment variables, buildtools
that have been built, and dependencies that have been built) as used
for the epa_build of plplot and plplot_lite.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt
    trunk/cmake/epa_build/README
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/plplot_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -307,6 +307,12 @@
   list(APPEND EPA_MAKE_COMMAND V=1)
 endif(CMAKE_VERBOSE_MAKEFILE)
 
+# This option runs the PLplot comprehensive test script for
+# the exact same build environment (i.e., cmake options, environment
+# variables, buildtools that have been built, and dependencies that
+# have been built) as used for the epa_build of plplot and
+# plplot_lite.
+option(ENABLE_COMPREHENSIVE_PLPLOT_TEST "Use comprehensive test for PLplot (which requires substantial CPU time and ~4GB of disk space)" OFF)
 
 # The parallel versions are for software packages that
 # do not have race conditions for parallel builds or tests.

Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/README	2013-12-16 00:14:36 UTC (rev 12868)
@@ -155,6 +155,13 @@
 # Check build_plplot.out for any errors
 less build_plplot.out
 
+# N.B. add the option -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON to the
+# above cmake command to run a comprehensive test script just after
+# PLplot is built and installed for both the build_plplot and
+# build_plplot_lite targets.  This test script (familiar to PLplot
+# developers) requires substantial extra CPU time and ~4GB of extra
+# disk space to run.
+
 2. Windows platforms
 
 Very similar to above, but I will fill in variations that I used

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -78,6 +78,14 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+    )
+  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
@@ -86,6 +94,6 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} test_noninteractive
+  ${TEST_COMMAND}
   STEP_TARGETS configure build install test
   )

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -82,6 +82,14 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+    )
+  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
@@ -90,6 +98,6 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} test_noninteractive
+  ${TEST_COMMAND}
   STEP_TARGETS configure build install test
   )

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

[Plplot-cvs] SF.net SVN: plplot:[12867] trunk/cmake/modules/pkg-config.cmake

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

Revision: 12867
          http://sourceforge.net/p/plplot/code/12867
Author:   airwin
Date:     2013-12-16 00:03:10 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
For the traditional build system for the installed examples which
depends on Make and pkg-config, honor the PKG_CONFIG_PATH environment
variable to be more consistent with what CMake does.

In certain cases the previous inconsistency between what CMake found
via pkg-config and what was found by the traditional build system via
pkg-config caused build errors for the traditional build system.
Those errors have now been solved by this fix.

Modified Paths:
--------------
    trunk/cmake/modules/pkg-config.cmake

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2013-12-15 23:56:37 UTC (rev 12866)
+++ trunk/cmake/modules/pkg-config.cmake	2013-12-16 00:03:10 UTC (rev 12867)
@@ -32,15 +32,20 @@
 # 			    if(PKG_CONFIG_EXECUTABLE)
 # PKG_CONFIG_DIR	  - install location for configured PLplot
 #  			    pkg-config files.
-# PKG_CONFIG_ENV	  - the string PKG_CONFIG_PATH=${PKG_CONFIG_DIR} which
+# PKG_CONFIG_ENV	  - the string PKG_CONFIG_PATH=
+#                           ${PKG_CONFIG_DIR}:$ENV{PKG_CONFIG_PATH} which
 #  			    is used in example builds.
-
 include(FindPkgConfig)
 
 if(PKG_CONFIG_EXECUTABLE)
   message(STATUS "Looking for pkg-config - found")
-  set(PKG_CONFIG_DIR ${LIB_DIR}/pkgconfig)
-  set(PKG_CONFIG_ENV PKG_CONFIG_PATH=${PKG_CONFIG_DIR})
+  set(PKG_CONFIG_DIR "${LIB_DIR}/pkgconfig")
+  set(env_PKG_CONFIG_PATH $ENV{PKG_CONFIG_PATH})
+  if(env_PKG_CONFIG_PATH)
+    set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${PKG_CONFIG_DIR}:${env_PKG_CONFIG_PATH}")
+  else(env_PKG_CONFIG_PATH)
+    set(PKG_CONFIG_ENV PKG_CONFIG_PATH="${PKG_CONFIG_DIR}")
+  endif(env_PKG_CONFIG_PATH)
 else(PKG_CONFIG_EXECUTABLE)
   message(STATUS "Looking for pkg-config - not found")
   message(STATUS

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

[Plplot-cvs] SF.net SVN: plplot:[12866] trunk/cmake/modules/tcl-related.cmake

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

Revision: 12866
          http://sourceforge.net/p/plplot/code/12866
Author:   airwin
Date:     2013-12-15 23:56:37 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
USE_TCL_TK_STUBS option temporarily set to OFF by default for this
release since using the the stubs versions of libTcl and libTk (which
is recommended by Tcl/Tk developers) has proven not to be reliable
(-dev tk segfaults) for version 8.6 of Tcl/Tk.  The stubs versions of
libTcl and libTk work fine for version 8.5 of Tcl/Tk.  Moving from the
deprecated Tcl/Tk API we currently use to the recommended Tcl/Tk API
may allow us to reliably use the stubs versions of libTcl and libTk
for all versions of Tcl/Tk post-release.

Modified Paths:
--------------
    trunk/cmake/modules/tcl-related.cmake

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2013-12-14 21:23:33 UTC (rev 12865)
+++ trunk/cmake/modules/tcl-related.cmake	2013-12-15 23:56:37 UTC (rev 12866)
@@ -34,7 +34,7 @@
 
 option(USE_INCRTCL_VERSION_4 "Use version 4 of Itcl and Itcl, version 4.1 of Iwidgets" OFF)
 
-option(USE_TCL_TK_STUBS "Use Tcl/Tk stubs libraries" ON)
+option(USE_TCL_TK_STUBS "Use Tcl/Tk stubs libraries" OFF)
 
 # Depending on these above options and system resources may also determine
 # the following variables which are largely self-explanatory unless documented

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

[Plplot-cvs] SF.net SVN: plplot:[12865] trunk/cmake/modules/plplot_functions.cmake

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

Revision: 12865
          http://sourceforge.net/p/plplot/code/12865
Author:   airwin
Date:     2013-12-14 21:23:33 +0000 (Sat, 14 Dec 2013)
Log Message:
-----------
FORTRAN ==> Fortran.  This bug fix should make no difference on Linux
where all three C, CXX, and Fortran variables are identical, but
it will make a (slight) difference on platforms where Fortran has
a different set of system locations than the C and C++ compilers.

Modified Paths:
--------------
    trunk/cmake/modules/plplot_functions.cmake

Modified: trunk/cmake/modules/plplot_functions.cmake
===================================================================
--- trunk/cmake/modules/plplot_functions.cmake	2013-12-13 19:27:57 UTC (rev 12864)
+++ trunk/cmake/modules/plplot_functions.cmake	2013-12-14 21:23:33 UTC (rev 12865)
@@ -205,7 +205,7 @@
     set(directories_to_be_removed
       ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}
       ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}
-      ${CMAKE_FORTRAN_IMPLICIT_LINK_DIRECTORIES}
+      ${CMAKE_Fortran_IMPLICIT_LINK_DIRECTORIES}
       )
 
     if(directories_to_be_removed)

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