From: <ai...@us...> - 2009-08-26 00:43:07
|
Revision: 10342 http://plplot.svn.sourceforge.net/plplot/?rev=10342&view=rev Author: airwin Date: 2009-08-26 00:42:59 +0000 (Wed, 26 Aug 2009) Log Message: ----------- install(EXPORT export_plplot ... only needs to be executed once in whole build tree. Do that in src/CMakeLists.txt. Modified Paths: -------------- trunk/bindings/ada/CMakeLists.txt trunk/bindings/c++/CMakeLists.txt trunk/bindings/d/CMakeLists.txt trunk/bindings/f77/CMakeLists.txt trunk/bindings/f95/CMakeLists.txt trunk/bindings/gnome2/lib/CMakeLists.txt trunk/bindings/lua/CMakeLists.txt trunk/bindings/qt_gui/CMakeLists.txt trunk/bindings/tcl/CMakeLists.txt trunk/bindings/wxwidgets/CMakeLists.txt trunk/drivers/CMakeLists.txt trunk/src/CMakeLists.txt Modified: trunk/bindings/ada/CMakeLists.txt =================================================================== --- trunk/bindings/ada/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/ada/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -99,12 +99,7 @@ LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION ${BIN_DIR} ) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotada.cmake - ) - # Configure pkg-config *.pc file corresponding to libplplotada${LIB_TAG} if(PKG_CONFIG_EXECUTABLE) if(LIB_TAG) Modified: trunk/bindings/c++/CMakeLists.txt =================================================================== --- trunk/bindings/c++/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/c++/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -69,11 +69,6 @@ LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION ${BIN_DIR} ) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotcxx.cmake - ) - install(FILES ${plplotcxx${LIB_TAG}_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR} Modified: trunk/bindings/d/CMakeLists.txt =================================================================== --- trunk/bindings/d/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/d/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -72,10 +72,6 @@ LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION ${BIN_DIR} ) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotd.cmake - ) # Configure pkg-config *.pc file corresponding to libplplotdmd${LIB_TAG} if(PKG_CONFIG_EXECUTABLE) Modified: trunk/bindings/f77/CMakeLists.txt =================================================================== --- trunk/bindings/f77/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/f77/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -190,11 +190,6 @@ ) endif(STATIC_OPTS) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotf77.cmake - ) - # Configure pkg-config *.pc file corresponding to libplplotf77${LIB_TAG} if(PKG_CONFIG_EXECUTABLE) if(LIB_TAG) Modified: trunk/bindings/f95/CMakeLists.txt =================================================================== --- trunk/bindings/f95/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/f95/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -185,11 +185,6 @@ ) endif(STATIC_OPTS) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotf95.cmake - ) - # For CMake-2.6.0 and above, the module files are created by # default during the library build in the bindings/f95 directory. install( Modified: trunk/bindings/gnome2/lib/CMakeLists.txt =================================================================== --- trunk/bindings/gnome2/lib/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/gnome2/lib/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -84,11 +84,6 @@ RUNTIME DESTINATION ${BIN_DIR} ) -install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotgnome2.cmake - ) - # Transform "${gcw_LINK_FLAGS}" to the # standard pkg-config form. pkg_config_link_flags( Modified: trunk/bindings/lua/CMakeLists.txt =================================================================== --- trunk/bindings/lua/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/lua/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -77,6 +77,4 @@ DESTINATION ${LUA_DIR} ) - install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) - endif(ENABLE_lua) Modified: trunk/bindings/qt_gui/CMakeLists.txt =================================================================== --- trunk/bindings/qt_gui/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/qt_gui/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -90,10 +90,6 @@ LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION ${BIN_DIR} ) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotqt.cmake - ) # Transform "${QT_LIBRARIES}" to the standard pkg-config form. pkg_config_link_flags( Modified: trunk/bindings/tcl/CMakeLists.txt =================================================================== --- trunk/bindings/tcl/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/tcl/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -237,11 +237,6 @@ RUNTIME DESTINATION ${BIN_DIR} ) -install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplottcltk.cmake - ) - set(plplottcltk${LIB_TAG}_INSTALLED_HEADERS pltcl.h ) Modified: trunk/bindings/wxwidgets/CMakeLists.txt =================================================================== --- trunk/bindings/wxwidgets/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/bindings/wxwidgets/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -89,11 +89,6 @@ RUNTIME DESTINATION ${BIN_DIR} ) - install(EXPORT export_plplot - DESTINATION ${DATA_DIR}/examples/cmake/modules - FILE export_plplotwxwidgets.cmake - ) - install(FILES ${plplotwxwidgets${LIB_TAG}_INSTALLED_HEADERS} DESTINATION ${INCLUDE_DIR} Modified: trunk/drivers/CMakeLists.txt =================================================================== --- trunk/drivers/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/drivers/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -196,8 +196,6 @@ EXPORT export_plplot DESTINATION ${DRV_DIR} ) - install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${SOURCE_ROOT_NAME}.rc DESTINATION ${DRV_DIR} Modified: trunk/src/CMakeLists.txt =================================================================== --- trunk/src/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341) +++ trunk/src/CMakeLists.txt 2009-08-26 00:42:59 UTC (rev 10342) @@ -298,6 +298,10 @@ LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION ${BIN_DIR} ) + +# This exports information for every target in the whole build that +# has the EXPORT export_plplot signature (as above) for the +# install(TARGETS ... # command. install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules) #message("libplplot${LIB_TAG}_LINK_FLAGS = ${libplplot${LIB_TAG}_LINK_FLAGS}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |