From: <ai...@us...> - 2014-01-12 03:12:28
|
Revision: 12934 http://sourceforge.net/p/plplot/code/12934 Author: airwin Date: 2014-01-12 03:12:25 +0000 (Sun, 12 Jan 2014) Log Message: ----------- Define and use ENABLE_tkX and ENABLE_itkX to help distingush cases where X is present or not along with Tk and Itk. Define and use generic_interactive_device, the device that is to be used with generic interactive tests. Normally, this device is xwin on Unix (with X) and wingcc on Windows (without X), but for the test case where X has not been found on Unix, it is ntk. Tested by Alan W. Irwin <ai...@us...> on Linux where the find for X11 was temporarily commented out so nothing X related was defined, and the build-system logic normally used for the Windows case could be tested (but with ntk as the generic interactive device). ldd -r and nm --undefined-only showed no issues for -dev ntk, the plplottcltk library, and the pltcl executable. The test_pltcl_standard_examples and test_tclsh_standard_examples targets completed without issues (after the ntk cmd array overflow bug found by example 27 was fixed). Note all these tests were in the build tree for the shared library/dynamic devices case so additional more comprehensive testing of these widespread changes with scripts/comprehensive_test.sh is recommended in the long term. Modified Paths: -------------- trunk/bindings/python/CMakeLists.txt trunk/bindings/tcl/CMakeLists.txt trunk/bindings/tk/CMakeLists.txt trunk/cmake/modules/tcl-related.cmake trunk/cmake/modules/tk.cmake trunk/examples/CMakeLists.txt trunk/examples/plplot_configure.cmake_installed_examples.in trunk/examples/python/CMakeLists.txt trunk/examples/tcl/tclsh_standard_examples.in trunk/examples/tk/CMakeLists.txt trunk/examples/tk/CMakeLists.txt_installed_examples_tk trunk/plplot_test/plplot-test-interactive.sh.in Modified: trunk/bindings/python/CMakeLists.txt =================================================================== --- trunk/bindings/python/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/bindings/python/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -22,7 +22,7 @@ # This is currently the include list for swig, the C wrapper and the # the Python headers. Not particular pretty... - if(ENABLE_tk) + if(ENABLE_tkX) set(python_interface_INCLUDE_PATHS ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib/qsastime @@ -36,7 +36,7 @@ ${NUMPY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/bindings/swig-support ) - else(ENABLE_tk) + else(ENABLE_tkX) set(python_interface_INCLUDE_PATHS ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/lib/qsastime @@ -47,7 +47,7 @@ ${NUMPY_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/bindings/swig-support ) - endif(ENABLE_tk) + endif(ENABLE_tkX) include_directories(${python_interface_INCLUDE_PATHS}) if(PL_DOUBLE) @@ -110,18 +110,18 @@ "-DUSINGDLL" ) - if(ENABLE_tk) + if(ENABLE_tkX) target_link_libraries( plplot_widgetmodule plplot${LIB_TAG} plplottcltk${LIB_TAG} ${PYTHON_LIBRARIES} ) - else(ENABLE_tk) + else(ENABLE_tkX) target_link_libraries( plplot_widgetmodule plplot${LIB_TAG} ${PYTHON_LIBRARIES} ) - endif(ENABLE_tk) + endif(ENABLE_tkX) if(USE_RPATH) set_target_properties( @@ -158,12 +158,12 @@ FILES plplot.py ${CMAKE_CURRENT_BINARY_DIR}/plplotc.py DESTINATION ${PYTHON_INSTDIR} ) - if(ENABLE_tk) + if(ENABLE_tkX) install( FILES Plframe.py TclSup.py DESTINATION ${PYTHON_INSTDIR} ) - endif(ENABLE_tk) + endif(ENABLE_tkX) endif(ENABLE_python) Modified: trunk/bindings/tcl/CMakeLists.txt =================================================================== --- trunk/bindings/tcl/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/bindings/tcl/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -209,7 +209,7 @@ ) endif(ENABLE_itcl) - if(ENABLE_tk) + if(ENABLE_tkX) set(plplottcltk${LIB_TAG}_LIB_SRCS ${plplottcltk${LIB_TAG}_LIB_SRCS} ${CMAKE_SOURCE_DIR}/bindings/tk/Pltk_Init.c @@ -280,7 +280,7 @@ ${TK_LIBRARY} ) - if(ENABLE_itk) + if(ENABLE_itkX) include_directories(${ITK_INCLUDE_PATH}) # tkMain.c is the only code that currently has a dependence on # itk library routines. Since that code is now part of the source code @@ -300,8 +300,8 @@ ${libplplottcltk_Main${LIB_TAG}_LINK_FLAGS} ${ITK_LIBRARY} ) - endif(ENABLE_itk) - endif(ENABLE_tk) + endif(ENABLE_itkX) + endif(ENABLE_tkX) # Transform "${libplplottcltk${LIB_TAG}_LINK_FLAGS}" string to the # standard pkg-config form. @@ -319,17 +319,17 @@ add_library(plplottcltk_Main${LIB_TAG} ${plplottcltk_Main${LIB_TAG}_LIB_SRCS}) if(USE_TCL_TK_STUBS) - if(ENABLE_tk) + if(ENABLE_tkX) set_target_properties( plplottcltk${LIB_TAG} PROPERTIES COMPILE_DEFINITIONS "USE_TCL_STUBS;USE_TK_STUBS" ) - else(ENABLE_tk) + else(ENABLE_tkX) set_target_properties( plplottcltk${LIB_TAG} PROPERTIES COMPILE_DEFINITIONS USE_TCL_STUBS ) - endif(ENABLE_tk) + endif(ENABLE_tkX) endif(USE_TCL_TK_STUBS) if(NON_TRANSITIVE) Modified: trunk/bindings/tk/CMakeLists.txt =================================================================== --- trunk/bindings/tk/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/bindings/tk/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -18,6 +18,42 @@ # along with PLplot; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +if(ENABLE_tkX) + include_directories( + ${TCL_INCLUDE_PATH} + ${TK_INCLUDE_PATH} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/bindings/tcl + ${CMAKE_SOURCE_DIR}/lib/qsastime + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include + ) + + if(BUILD_SHARED_LIBS) + set_source_files_properties(plserver.c + PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" ) + endif(BUILD_SHARED_LIBS) + + add_executable(plserver plserver.c) + target_link_libraries(plserver plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY}) + + 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}" + ) + endif(USE_RPATH) + + install(TARGETS plserver + EXPORT export_plplot + DESTINATION ${BIN_DIR} + ) +endif(ENABLE_tkX) + if(ENABLE_tk) set(include_INSTALLED_HEADERS @@ -85,41 +121,6 @@ DESTINATION ${TCL_DIR} ) - include_directories( - ${TCL_INCLUDE_PATH} - ${TK_INCLUDE_PATH} - ${CMAKE_SOURCE_DIR}/include - ${CMAKE_SOURCE_DIR}/bindings/tcl - ${CMAKE_SOURCE_DIR}/lib/qsastime - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/include - ) - - - if(BUILD_SHARED_LIBS) - set_source_files_properties(plserver.c - PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" ) - endif(BUILD_SHARED_LIBS) - - add_executable(plserver plserver.c) - target_link_libraries(plserver plplot${LIB_TAG} plplottcltk_Main${LIB_TAG} plplottcltk${LIB_TAG} ${TK_LIBRARY} ${TCL_LIBRARY}) - - 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}" - ) - endif(USE_RPATH) - - install(TARGETS plserver - EXPORT export_plplot - DESTINATION ${BIN_DIR} - ) - add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} Modified: trunk/cmake/modules/tcl-related.cmake =================================================================== --- trunk/cmake/modules/tcl-related.cmake 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/cmake/modules/tcl-related.cmake 2014-01-12 03:12:25 UTC (rev 12934) @@ -371,17 +371,6 @@ set(ENABLE_tk OFF CACHE BOOL "Enable Tk bindings" FORCE) endif(ENABLE_tk AND TK_FOUND) - if(ENABLE_tk AND NOT X11_FOUND) - if(WIN32 AND NOT CYGWIN) - message(STATUS "WARNING: X11 not found, turning off Tk devices that depend on it") - set(PLD_tk OFF CACHE BOOL "Enable Tk device" FORCE) - set(PLD_tkwin OFF CACHE BOOL "Enable Tk device" FORCE) - else(WIN32 AND NOT CYGWIN) - message(STATUS "WARNING: X11 not found so disabling Tk interface code") - set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE) - endif(WIN32 AND NOT CYGWIN) - endif(ENABLE_tk AND NOT X11_FOUND) - if(ENABLE_tk) get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH) list(APPEND TCL_TK_RPATH ${TK_LIBRARY_PATH}) @@ -601,6 +590,18 @@ set(ENABLE_itk OFF CACHE BOOL "Enable Itk interface code" FORCE) endif(ENABLE_tcl) +if(ENABLE_tk AND X11_FOUND) + set(ENABLE_tkX ON) +else(ENABLE_tk AND X11_FOUND) + set(ENABLE_tkX OFF) +endif(ENABLE_tk AND X11_FOUND) + +if(ENABLE_itk AND X11_FOUND) + set(ENABLE_itkX ON) +else(ENABLE_itk AND X11_FOUND) + set(ENABLE_itkX OFF) +endif(ENABLE_itk AND X11_FOUND) + if(NOT ENABLE_itcl) set(PLPLOT_ITCL_VERSION 0.0.0) endif(NOT ENABLE_itcl) Modified: trunk/cmake/modules/tk.cmake =================================================================== --- trunk/cmake/modules/tk.cmake 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/cmake/modules/tk.cmake 2014-01-12 03:12:25 UTC (rev 12934) @@ -46,17 +46,21 @@ # DRIVERS_LINK_FLAGS - list of LINK_FLAGS for all static devices. # tkwin_SOURCE - list of source files other than tkwin.c -if(NOT ENABLE_tk) - if(PLD_tk OR PLD_ntk OR PLD_tkwin) - message(STATUS - "WARNING: ENABLE_tk OFF. Setting PLD_tk, PLD_ntk, and PLD_tkwin OFF." +if(NOT ENABLE_tk AND (PLD_tk OR PLD_ntk OR PLD_tkwin)) + message(STATUS + "WARNING: ENABLE_tk OFF. Therefore turning off tk, tkwin, and ntk devices" ) - set(PLD_tk OFF CACHE BOOL "Enable tk device" FORCE) - set(PLD_ntk OFF CACHE BOOL "Enable ntk device" FORCE) - set(PLD_tkwin OFF CACHE BOOL "Enable tkwin device" FORCE) - endif(PLD_tk OR PLD_ntk OR PLD_tkwin) -endif(NOT ENABLE_tk) + set(PLD_tk OFF CACHE BOOL "Enable tk device" FORCE) + set(PLD_ntk OFF CACHE BOOL "Enable ntk device" FORCE) + set(PLD_tkwin OFF CACHE BOOL "Enable tkwin device" FORCE) +endif(NOT ENABLE_tk AND (PLD_tk OR PLD_ntk OR PLD_tkwin)) +if(NOT X11_FOUND AND (PLD_tk OR PLD_tkwin)) + message(STATUS "WARNING: X11 not found. Therefore turning off tk and tkwin devices that depend on it") + set(PLD_tk OFF CACHE BOOL "Enable Tk device" FORCE) + set(PLD_tkwin OFF CACHE BOOL "Enable Tk device" FORCE) +endif(NOT X11_FOUND AND (PLD_tk OR PLD_tkwin)) + # Transform TK_INCLUDE_PATH (which is a list) to blank-delimited flag form. string(REGEX REPLACE ";" " -I" TKLIB_COMPILE_FLAGS "-I${TK_INCLUDE_PATH}") Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -87,9 +87,9 @@ set(CXX_COMMENT "#") endif(NOT(ENABLE_cxx AND (PLD_ps OR ENABLE_qt))) - if(NOT ENABLE_tk) + if(NOT ENABLE_tkX) set(TK_COMMENT "#") - endif(NOT ENABLE_tk) + endif(NOT ENABLE_tkX) if(NOT PLD_pdfcairo) set(PDFCAIRO_COMMENT "#") @@ -418,6 +418,22 @@ remove_definitions("-DHAVE_CONFIG_H") endif(CORE_BUILD AND BUILD_TEST) +# Decide on device to be used for generic interactive tests. + +if(PLD_xwin) + # Typically for Unix with X + set(generic_interactive_device xwin) +elseif(PLD_wingcc) + # Typically for Windows without X + set(generic_interactive_device wingcc) +elseif(PLD_ntk) + # A special test case used on Unix for when we have deliberately not + # looked for X simply to test the non-X logic. + set(generic_interactive_device ntk) +else(PLD_xwin) + set(generic_interactive_device) +endif(PLD_xwin) + # language_info_LIST excludes the tk subdirectly since noninteractive # tests and file results do not involve tk. However, the tk # subdirectory does have to be processed just like the rest @@ -466,6 +482,7 @@ set(java_custom_env ${custom_env}) set(compare_script ${CMAKE_CURRENT_SOURCE_DIR}/test_diff.sh) endif(CORE_BUILD) + set(custom_test_command ${SH_EXECUTABLE} ${custom_test_script}) set(compare_command ${SH_EXECUTABLE} ${compare_script}) @@ -657,6 +674,13 @@ ) set(xwin_target ${FILE_DEPENDS_xwin} xwin) + if(generic_interactive_device) + get_property(FILE_DEPENDS_${generic_interactive_device} + GLOBAL PROPERTY FILE_DEPENDS_${generic_interactive_device}_dyndriver + ) + set(${generic_interactive_device}_target ${FILE_DEPENDS_${generic_interactive_device}} ${generic_interactive_device}) + endif(generic_interactive_device) + endif(ENABLE_DYNDRIVERS) if(PLD_extcairo) add_custom_command( @@ -897,21 +921,21 @@ list(APPEND interactive_targets_LIST test_pygcw) endif(ENABLE_pygcw) - if(ENABLE_tcl AND PLD_xwin) + if(ENABLE_tcl AND PLD_${generic_interactive_device}) add_custom_target(test_pltcl_standard_examples - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev xwin -np - DEPENDS ${xwin_target} + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/pltcl_standard_examples -dev ${generic_interactive_device} -np + DEPENDS ${${generic_interactive_device}_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) add_dependencies(test_pltcl_standard_examples pltcl tcl_examples tclIndex_tcl - xwin + ${generic_interactive_device} ) - if(FILE_DEPENDS_xwin) - add_dependencies(test_pltcl_standard_examples test_xwin_dyndriver) - endif(FILE_DEPENDS_xwin) + if(FILE_DEPENDS_${generic_interactive_device}) + add_dependencies(test_pltcl_standard_examples test_${generic_interactive_device}_dyndriver) + endif(FILE_DEPENDS_${generic_interactive_device}) list(APPEND interactive_targets_LIST test_pltcl_standard_examples) if(BUILD_SHARED_LIBS) @@ -919,23 +943,23 @@ # BUILD_SHARED_LIBS is true. add_custom_target(test_tclsh_standard_examples COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tcl/tclsh_standard_examples - DEPENDS ${xwin_target} + DEPENDS ${${generic_interactive_device}_target} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/tcl ) add_dependencies(test_tclsh_standard_examples plplottcltk${LIB_TAG} tcl_examples tclIndex_tcl - xwin + ${generic_interactive_device} ) - if(FILE_DEPENDS_xwin) - add_dependencies(test_tclsh_standard_examples test_xwin_dyndriver) - endif(FILE_DEPENDS_xwin) + if(FILE_DEPENDS_${generic_interactive_device}) + add_dependencies(test_tclsh_standard_examples test_${generic_interactive_device}_dyndriver) + endif(FILE_DEPENDS_${generic_interactive_device}) list(APPEND interactive_targets_LIST test_tclsh_standard_examples) endif(BUILD_SHARED_LIBS) - endif(ENABLE_tcl AND PLD_xwin) + endif(ENABLE_tcl AND PLD_${generic_interactive_device}) - if(ENABLE_tk AND PLD_tk) + if(ENABLE_tkX AND PLD_tk) set(targets_examples_tk) add_custom_target(test_tk_01 @@ -1043,7 +1067,7 @@ # list(APPEND targets_examples_tk test_wish_standard_examples) endif(BUILD_SHARED_LIBS) - if(ENABLE_itk) + if(ENABLE_itkX) add_custom_target(test_tk_02 COMMAND xtk02 -f ${CMAKE_CURRENT_BINARY_DIR}/tk/tk02 DEPENDS ${xwin_target} @@ -1124,8 +1148,8 @@ # list(APPEND targets_examples_tk test_wish_runAlldemos) endif(BUILD_SHARED_LIBS) - endif(ENABLE_itk) - endif(ENABLE_tk AND PLD_tk) + endif(ENABLE_itkX) + endif(ENABLE_tkX AND PLD_tk) if(targets_examples_tk) list(APPEND interactive_targets_LIST ${targets_examples_tk}) Modified: trunk/examples/plplot_configure.cmake_installed_examples.in =================================================================== --- trunk/examples/plplot_configure.cmake_installed_examples.in 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/plplot_configure.cmake_installed_examples.in 2014-01-12 03:12:25 UTC (rev 12934) @@ -49,6 +49,7 @@ # Interactive bindings set(ENABLE_tk @ENABLE_tk@) +set(ENABLE_tkX @ENABLE_tkX@) set(ENABLE_gnome2 @ENABLE_gnome2@) set(ENABLE_wxwidgets @ENABLE_wxwidgets@) set(ENABLE_qt @ENABLE_qt@) @@ -137,6 +138,7 @@ if(ENABLE_tk) set(ENABLE_itk @ENABLE_itk@) + set(ENABLE_itkX @ENABLE_itkX@) set(TCL_INCLUDE_PATH @TCL_INCLUDE_PATH@) set(TK_INCLUDE_PATH @TK_INCLUDE_PATH@) set(TCL_LIBRARY @TCL_LIBRARY@) Modified: trunk/examples/python/CMakeLists.txt =================================================================== --- trunk/examples/python/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/python/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -93,7 +93,7 @@ test_linebreak.py ) -if(ENABLE_tk) +if(ENABLE_tkX) set(python_SCRIPTS ${python_SCRIPTS} pytkdemo x01.py @@ -116,7 +116,7 @@ x18.py x19.py ) -endif(ENABLE_tk) +endif(ENABLE_tkX) if(ENABLE_pyqt4) set( Modified: trunk/examples/tcl/tclsh_standard_examples.in =================================================================== --- trunk/examples/tcl/tclsh_standard_examples.in 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/tcl/tclsh_standard_examples.in 2014-01-12 03:12:25 UTC (rev 12934) @@ -1,7 +1,5 @@ #!@SH_EXECUTABLE@ # Examples 14 and 31 commented out - see Tk standard_examples.in -# Choose the xwin device below although any other interactive -# device would work. # The following exec command reexecutes the script under tclsh. This # is possible because all comment lines are ignored by tclsh including # continued ones with a trailing backslash like this one \ @@ -9,7 +7,7 @@ lappend auto_path @pkgIndex_LOCATION@ package require Pltcl source tcldemos.tcl -plsdev "xwin" +plsdev "@generic_interactive_device@" plinit # Disable pausing. plspause 0 Modified: trunk/examples/tk/CMakeLists.txt =================================================================== --- trunk/examples/tk/CMakeLists.txt 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/tk/CMakeLists.txt 2014-01-12 03:12:25 UTC (rev 12934) @@ -122,13 +122,18 @@ DEPENDS ${tk_FILES} ${CMAKE_CURRENT_BINARY_DIR}/tclIndex ) +set(tk_SRC) +if(ENABLE_tkX) + list(APPEND tk_SRC xtk01.c) +endif(ENABLE_tkX) + # The third example is run using a configured shell script which invokes # plserver so there is no source code to be compiled. -set(tk_SRC xtk01.c) + # The second and fourth Tk examples depend on Itk to work. -if(ENABLE_itk) +if(ENABLE_itkX) list(APPEND tk_SRC xtk02.c xtk04.c) -endif(ENABLE_itk) +endif(ENABLE_itkX) # The first, second, and fourth tk examples depend on configured bang # scripts to work which depends directly on the executables, xtk01, @@ -150,14 +155,14 @@ wish_standard_examples ) # These examples depend on Itk to work. -if(ENABLE_itk) +if(ENABLE_itkX) list(APPEND tk_SCRIPTS tk02 tk04 plserver_runAllDemos wish_runAllDemos ) -endif(ENABLE_itk) +endif(ENABLE_itkX) if(BUILD_TEST) if(CORE_BUILD) Modified: trunk/examples/tk/CMakeLists.txt_installed_examples_tk =================================================================== --- trunk/examples/tk/CMakeLists.txt_installed_examples_tk 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/examples/tk/CMakeLists.txt_installed_examples_tk 2014-01-12 03:12:25 UTC (rev 12934) @@ -114,10 +114,10 @@ set(tk_SCRIPTS tk01 tk03) set(tk_SRC xtk01.c) -if(ENABLE_itk) +if(ENABLE_itkX) list(APPEND tk_SCRIPTS tk02 tk04) list(APPEND tk_SRC xtk02.c xtk04.c) -endif(ENABLE_itk) +endif(ENABLE_itkX) include_directories( ${TCL_INCLUDE_PATH} Modified: trunk/plplot_test/plplot-test-interactive.sh.in =================================================================== --- trunk/plplot_test/plplot-test-interactive.sh.in 2014-01-12 02:53:54 UTC (rev 12933) +++ trunk/plplot_test/plplot-test-interactive.sh.in 2014-01-12 03:12:25 UTC (rev 12934) @@ -2,7 +2,7 @@ # -*- mode: shell-script -*- # $Id$ # -# Copyright (C) 2009 Alan W. Irwin +# Copyright (C) 2009-2014 Alan W. Irwin # # This file is part of PLplot. # @@ -207,28 +207,28 @@ COUNT=$(( $COUNT + 1 )) fi -if [ "@ENABLE_tk@" = "ON" ] ; then +if [ "@ENABLE_tkX@" = "ON" ] ; then INDEX_LIST="$INDEX_LIST $COUNT" DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk" COMMAND[$COUNT]="./xtk01 -f tk01" COUNT=$(( $COUNT + 1 )) fi -if [ "@ENABLE_itk@" = "ON" ] ; then +if [ "@ENABLE_itkX@" = "ON" ] ; then INDEX_LIST="$INDEX_LIST $COUNT" DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk" COMMAND[$COUNT]="./xtk02 -f tk02" COUNT=$(( $COUNT + 1 )) fi -if [ "@ENABLE_tk@" = "ON" ] ; then +if [ "@ENABLE_tkX@" = "ON" ] ; then INDEX_LIST="$INDEX_LIST $COUNT" DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk" COMMAND[$COUNT]="plserver -f tk03" COUNT=$(( $COUNT + 1 )) fi -if [ "@ENABLE_itk@" = "ON" ] ; then +if [ "@ENABLE_itkX@" = "ON" ] ; then INDEX_LIST="$INDEX_LIST $COUNT" DIRECTORY[$COUNT]="${EXAMPLES_DIR}/tk" COMMAND[$COUNT]="./xtk04 -f tk04" @@ -256,7 +256,7 @@ popd done -if [ "@ENABLE_tk@" = "ON" ] ; then +if [ "@ENABLE_tkX@" = "ON" ] ; then cd "${SRC_EXAMPLES_DIR}"/tcl plserver <<EOF This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |