From: <ai...@us...> - 2008-08-20 23:34:18
|
Revision: 8692 http://plplot.svn.sourceforge.net/plplot/?rev=8692&view=rev Author: airwin Date: 2008-08-20 23:34:28 +0000 (Wed, 20 Aug 2008) Log Message: ----------- emacs CMake mode indentation changes. Make itcl headers accessible to plserver for the ENABLE_itcl case. Make itk headers accessible to plserver for the ENABLE_itk case. Modified Paths: -------------- trunk/bindings/tk/CMakeLists.txt Modified: trunk/bindings/tk/CMakeLists.txt =================================================================== --- trunk/bindings/tk/CMakeLists.txt 2008-08-20 23:29:36 UTC (rev 8691) +++ trunk/bindings/tk/CMakeLists.txt 2008-08-20 23:34:28 UTC (rev 8692) @@ -20,145 +20,153 @@ if(ENABLE_tk) -set(include_INSTALLED_HEADERS -pltk.h -) + set(include_INSTALLED_HEADERS + pltk.h + ) -install(FILES ${include_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR}) + install(FILES ${include_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR}) -set(tcldata -FileSelector.tcl -Pltkwin.tcl -about.tcl -help_gui.tcl -help_keys.tcl -help_tcltk.tcl -plclient.tcl -plcolor.tcl -plconfig.tcl -pldefaults.tcl -plplot.tcl -plserver.tcl -pltools.tcl -plwidget.tcl -) + set(tcldata + FileSelector.tcl + Pltkwin.tcl + about.tcl + help_gui.tcl + help_keys.tcl + help_tcltk.tcl + plclient.tcl + plcolor.tcl + plconfig.tcl + pldefaults.tcl + plplot.tcl + plserver.tcl + pltools.tcl + plwidget.tcl + ) -set(itkdata -PLWin.itk -PLXWin.itk -) + set(itkdata + PLWin.itk + PLXWin.itk + ) -set(paldata -cmap0a.pal -cmap1a.pal -cmap1a1.pal -cmap1b.pal -cmap1c.pal -cmap1d.pal -) + set(paldata + cmap0a.pal + cmap1a.pal + cmap1a1.pal + cmap1b.pal + cmap1c.pal + cmap1d.pal + ) -# Ugly hack to copy all .tcl files to the build tree so that tclIndex -# can be generated there. This is a limitation is tcl's auto_mkindex which -# always generates the index in the directory with the files. -if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - set(tclIndex_DEPENDS) - foreach(file ${tcldata} ${itkdata}) - set( - tclIndex_DEPENDS - ${tclIndex_DEPENDS} - ${CMAKE_CURRENT_BINARY_DIR}/${file} + # Ugly hack to copy all .tcl files to the build tree so that tclIndex + # can be generated there. This is a limitation is tcl's auto_mkindex which + # always generates the index in the directory with the files. + if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(tclIndex_DEPENDS) + foreach(file ${tcldata} ${itkdata}) + set( + tclIndex_DEPENDS + ${tclIndex_DEPENDS} + ${CMAKE_CURRENT_BINARY_DIR}/${file} + ) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} + COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + ) + endforeach(file ${tcldata} ${itkdata}) + add_custom_target(tcl_files ALL DEPENDS ${tclIndex_DEPENDS}) + else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + set(tclIndex_DEPENDS ${tcldata} ${itkdata}) + endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + + install( + FILES ${tcldata} ${itkdata} ${paldata} + DESTINATION ${TCL_DIR} ) - add_custom_command( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file} - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file} + + include_directories( + ${TCL_INCLUDE_PATH} + ${TK_INCLUDE_PATH} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/bindings/tcl + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/include ) - endforeach(file ${tcldata} ${itkdata}) - add_custom_target(tcl_files ALL DEPENDS ${tclIndex_DEPENDS}) -else(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - set(tclIndex_DEPENDS ${tcldata} ${itkdata}) -endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -install( -FILES ${tcldata} ${itkdata} ${paldata} -DESTINATION ${TCL_DIR} -) + if(ENABLE_itcl) + include_directories(${ITCL_INCLUDE_PATH}) + endif(ENABLE_itcl) -include_directories( -${TCL_INCLUDE_PATH} -${TK_INCLUDE_PATH} -${CMAKE_SOURCE_DIR}/include -${CMAKE_SOURCE_DIR}/bindings/tcl -${CMAKE_CURRENT_SOURCE_DIR} -${CMAKE_BINARY_DIR} -${CMAKE_BINARY_DIR}/include -) + if(ENABLE_itk) + include_directories(${ITK_INCLUDE_PATH}) + endif(ENABLE_itk) -add_executable(plserver plserver.c) -target_link_libraries(plserver plplot${LIB_TAG} plplottcltk${LIB_TAG}) + add_executable(plserver plserver.c) + target_link_libraries(plserver plplot${LIB_TAG} plplottcltk${LIB_TAG}) -if(USE_RPATH) - get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) - set_target_properties(plserver - PROPERTIES - INSTALL_RPATH "${LIB_INSTALL_RPATH}" - ) -endif(USE_RPATH) + if(USE_RPATH) + get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH) + set_target_properties(plserver + PROPERTIES + INSTALL_RPATH "${LIB_INSTALL_RPATH}" + ) + endif(USE_RPATH) -install(TARGETS plserver DESTINATION ${BIN_DIR}) + install(TARGETS plserver DESTINATION ${BIN_DIR}) -add_custom_command( -OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} -DEPENDS ${tclIndex_DEPENDS} -WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + COMMAND ${TCL_TCLSH} ${MKTCLINDEX} ${MKTCLINDEX_ARGS} + DEPENDS ${tclIndex_DEPENDS} + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) -add_custom_target(tclIndex_tk ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -) + add_custom_target(tclIndex_tk ALL + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + ) -# The tcl_files dependency is required to -# work around CMake 2-level make recursion issue where independent -# file dependency chains that refer to the same files must have -# target dependencies between them in order to work for parallel -# builds (and possibly some visual studio builds). -if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") - add_dependencies(tclIndex_tk tcl_files) -endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + # The tcl_files dependency is required to + # work around CMake 2-level make recursion issue where independent + # file dependency chains that refer to the same files must have + # target dependencies between them in order to work for parallel + # builds (and possibly some visual studio builds). + if(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") + add_dependencies(tclIndex_tk tcl_files) + endif(NOT CMAKE_CURRENT_BINARY_DIR STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") -install( -FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex -DESTINATION ${TCL_DIR} -) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/tclIndex + DESTINATION ${TCL_DIR} + ) -set(DRV_HARDDIR ${DRV_DIR}) -set(LIB_HARDDIR ${LIB_DIR}) + set(DRV_HARDDIR ${DRV_DIR}) + set(LIB_HARDDIR ${LIB_DIR}) -get_target_property( -DLNAME_LIBPLPLOT -plplot${LIB_TAG} -LOCATION -) -get_filename_component( -DLNAME_LIBPLPLOT -${DLNAME_LIBPLPLOT} -NAME -) -string(REPLACE "plplotd" "plplot" -DLNAME_LIBPLPLOT -${DLNAME_LIBPLPLOT} -) -string(REPLACE "plplot" "plplotd" -DLNAME_LIBPLPLOTD -${DLNAME_LIBPLPLOT} -) + get_target_property( + DLNAME_LIBPLPLOT + plplot${LIB_TAG} + LOCATION + ) + get_filename_component( + DLNAME_LIBPLPLOT + ${DLNAME_LIBPLPLOT} + NAME + ) + string(REPLACE "plplotd" "plplot" + DLNAME_LIBPLPLOT + ${DLNAME_LIBPLPLOT} + ) + string(REPLACE "plplot" "plplotd" + DLNAME_LIBPLPLOTD + ${DLNAME_LIBPLPLOT} + ) -configure_file( -${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in -${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl -@ONLY -) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/pkgIndex.tcl.in + ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl + @ONLY + ) endif(ENABLE_tk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2008-08-20 23:55:44
|
Revision: 8693 http://plplot.svn.sourceforge.net/plplot/?rev=8693&view=rev Author: airwin Date: 2008-08-20 23:55:53 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Revert Make itcl headers accessible to plserver for the ENABLE_itcl case. Make itk headers accessible to plserver for the ENABLE_itk case. part of previous commit. It turns out plserver doesn't directly access itcl or itk so there was no need for these changes that have now been reverted. Modified Paths: -------------- trunk/bindings/tk/CMakeLists.txt Modified: trunk/bindings/tk/CMakeLists.txt =================================================================== --- trunk/bindings/tk/CMakeLists.txt 2008-08-20 23:34:28 UTC (rev 8692) +++ trunk/bindings/tk/CMakeLists.txt 2008-08-20 23:55:53 UTC (rev 8693) @@ -95,14 +95,6 @@ ${CMAKE_BINARY_DIR}/include ) - if(ENABLE_itcl) - include_directories(${ITCL_INCLUDE_PATH}) - endif(ENABLE_itcl) - - if(ENABLE_itk) - include_directories(${ITK_INCLUDE_PATH}) - endif(ENABLE_itk) - add_executable(plserver plserver.c) target_link_libraries(plserver plplot${LIB_TAG} plplottcltk${LIB_TAG}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2009-11-10 19:04:30
|
Revision: 10578 http://plplot.svn.sourceforge.net/plplot/?rev=10578&view=rev Author: airwin Date: 2009-11-10 19:04:24 +0000 (Tue, 10 Nov 2009) Log Message: ----------- EXPORT plserver target to make that target available for installed examples build. Modified Paths: -------------- trunk/bindings/tk/CMakeLists.txt Modified: trunk/bindings/tk/CMakeLists.txt =================================================================== --- trunk/bindings/tk/CMakeLists.txt 2009-11-10 18:11:15 UTC (rev 10577) +++ trunk/bindings/tk/CMakeLists.txt 2009-11-10 19:04:24 UTC (rev 10578) @@ -98,8 +98,8 @@ if(BUILD_SHARED_LIBS) - SET_SOURCE_FILES_PROPERTIES(plserver.c - PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" ) + set_source_files_properties(plserver.c + PROPERTIES COMPILE_FLAGS "-DUSINGPLDLL" ) endif(BUILD_SHARED_LIBS) add_executable(plserver plserver.c) @@ -113,7 +113,10 @@ ) endif(USE_RPATH) - install(TARGETS plserver DESTINATION ${BIN_DIR}) + install(TARGETS plserver + EXPORT export_plplot + DESTINATION ${BIN_DIR} + ) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tclIndex This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2013-12-17 21:03:16
|
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. |
From: <and...@us...> - 2009-02-23 09:56:45
|
Revision: 9584 http://plplot.svn.sourceforge.net/plplot/?rev=9584&view=rev Author: andrewross Date: 2009-02-23 09:56:40 +0000 (Mon, 23 Feb 2009) Log Message: ----------- bindings/tk needs to include lib/qsastime in the include path as it makes use of plplotP.h Modified Paths: -------------- trunk/bindings/tk/CMakeLists.txt Modified: trunk/bindings/tk/CMakeLists.txt =================================================================== --- trunk/bindings/tk/CMakeLists.txt 2009-02-23 03:31:55 UTC (rev 9583) +++ trunk/bindings/tk/CMakeLists.txt 2009-02-23 09:56:40 UTC (rev 9584) @@ -90,6 +90,7 @@ ${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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |