From: Alan W. I. <ai...@us...> - 2006-10-31 21:13:21
|
Update of /cvsroot/plplot/plplot/cmake/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28888 Modified Files: plplot.cmake tk.cmake xwin.cmake Log Message: Include the X headers and libraries in the Tk headers and libraries. This change appears to be necessary for the Mac OS X platform. Index: xwin.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/xwin.cmake,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- xwin.cmake 22 Jul 2006 17:04:01 -0000 1.5 +++ xwin.cmake 31 Oct 2006 21:13:19 -0000 1.6 @@ -28,7 +28,6 @@ # HAVE_PTHREAD - ON means use pthreads with xwin driver. # PLPLOT_MUTEX_RECURSIVE - Portable definition for PTHREAD_MUTEX_RECURSIVE if(PLD_xwin) - find_package(X11) if(X11_FOUND) string(REGEX REPLACE ";" ";-I" xwin_COMPILE_FLAGS Index: tk.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/tk.cmake,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- tk.cmake 14 Aug 2006 15:41:30 -0000 1.6 +++ tk.cmake 31 Oct 2006 21:13:19 -0000 1.7 @@ -52,9 +52,12 @@ set(PLD_tkwin OFF CACHE BOOL "Enable tkwin device" FORCE) endif(NOT ENABLE_tk) +# Transform TK_INCLUDE_PATH (which is a list) to blank-delimited flag form. +string(REGEX REPLACE ";" " -I" TKLIB_COMPILE_FLAGS "-I${TK_INCLUDE_PATH}") + if(PLD_tk) set(tk_COMPILE_FLAGS - "-I${TCL_INCLUDE_PATH} -I${TK_INCLUDE_PATH} -I${CMAKE_SOURCE_DIR}/bindings/tcl -I${CMAKE_BINARY_DIR}/bindings/tcl -I${CMAKE_SOURCE_DIR}/bindings/tk" + "-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(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${TCL_LIBRARY} ${TK_LIBRARY}) @@ -93,14 +96,14 @@ endif(PLD_tk) if(PLD_ntk) - set(ntk_COMPILE_FLAGS "-I${TCL_INCLUDE_PATH} -I${TK_INCLUDE_PATH}") + set(ntk_COMPILE_FLAGS "-I${TCL_INCLUDE_PATH} ${TKLIB_COMPILE_FLAGS}") set(ntk_LINK_FLAGS ${TCL_LIBRARY} ${TK_LIBRARY}) set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${ntk_LINK_FLAGS}) endif(PLD_ntk) if(PLD_tkwin) set(tkwin_COMPILE_FLAGS - "-I${TCL_INCLUDE_PATH} -I${TK_INCLUDE_PATH} -I${CMAKE_SOURCE_DIR}/bindings/tcl -I${CMAKE_BINARY_DIR}/bindings/tcl -I${CMAKE_SOURCE_DIR}/bindings/tk-x-plat -I${CMAKE_SOURCE_DIR}/bindings/tk" + "-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-x-plat -I${CMAKE_SOURCE_DIR}/bindings/tk" ) set(tkwin_LINK_FLAGS plplottcltk${LIB_TAG} ${TCL_LIBRARY} ${TK_LIBRARY}) set(DRIVERS_LINK_FLAGS ${DRIVERS_LINK_FLAGS} ${TCL_LIBRARY} ${TK_LIBRARY}) Index: plplot.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/cmake/modules/plplot.cmake,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- plplot.cmake 30 Oct 2006 03:15:59 -0000 1.37 +++ plplot.cmake 31 Oct 2006 21:13:19 -0000 1.38 @@ -188,6 +188,14 @@ include(CheckPerlModules) endif(PERL_FOUND) +# Find X headers, libraries, and library directory (required by xwin device +# driver and also everything that is Tk related). +find_package(X11) +message(STATUS "X11_FOUND = ${X11_FOUND}") +message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}") +message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}") +message(STATUS "X11_LIBRARY_DIR = ${X11_LIBRARY_DIR}") + # Load language specific files include(c++) include(fortran) |