From: <ai...@us...> - 2009-04-18 01:01:31
|
Revision: 9818 http://plplot.svn.sourceforge.net/plplot/?rev=9818&view=rev Author: airwin Date: 2009-04-18 01:01:29 +0000 (Sat, 18 Apr 2009) Log Message: ----------- Implement using the pkg-config method to build Alban Rochel's simple Qt GUI application in the installed examples tree. Modified Paths: -------------- trunk/examples/CMakeLists.txt trunk/examples/c++/CMakeLists.txt trunk/examples/c++/Makefile.examples.in Added Paths: ----------- trunk/examples/c++/README.qt_example Modified: trunk/examples/CMakeLists.txt =================================================================== --- trunk/examples/CMakeLists.txt 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/CMakeLists.txt 2009-04-18 01:01:29 UTC (rev 9818) @@ -23,6 +23,11 @@ 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) + get_target_property(_qt_INSTALL_RPATH qt INSTALL_RPATH) + string(REGEX REPLACE ";" ":" qt_INSTALL_RPATH "${_qt_INSTALL_RPATH}") + set(qt_RPATHCMD "-Wl,-rpath -Wl,${qt_INSTALL_RPATH}:${DRV_DIR}") + endif(PLD_extqt) endif(USE_RPATH) # Install lena.pgm in installed examples directory so that all implementations Modified: trunk/examples/c++/CMakeLists.txt =================================================================== --- trunk/examples/c++/CMakeLists.txt 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/c++/CMakeLists.txt 2009-04-18 01:01:29 UTC (rev 9818) @@ -97,8 +97,12 @@ set(wxPLplotDemo_SRCS wxPLplotDemo.cpp) endif(ENABLE_wxwidgets) -install(FILES ${cxx_SRCS} ${wxPLplotDemo_SRCS} DESTINATION ${DATA_DIR}/examples/c++) +if(PLD_extqt) + set(qt_INSTALLED_FILES qt_PlotWindow.cpp qt_PlotWindow.h qt_example.cpp README.qt_example) +endif(PLD_extqt) +install(FILES ${cxx_SRCS} ${wxPLplotDemo_SRCS} ${qt_INSTALLED_FILES} DESTINATION ${DATA_DIR}/examples/c++) + set(CXX ${CMAKE_CXX_COMPILER}) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.examples.in Modified: trunk/examples/c++/Makefile.examples.in =================================================================== --- trunk/examples/c++/Makefile.examples.in 2009-04-18 00:57:03 UTC (rev 9817) +++ trunk/examples/c++/Makefile.examples.in 2009-04-18 01:01:29 UTC (rev 9818) @@ -27,10 +27,15 @@ @pkg_config_true@LIB_TAG = @LIB_TAG@ @pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@ @pkg_config_true@RPATHCMD = @RPATHCMD@ +@qt_gui_true@QT_MOC_EXECUTABLE = @QT_MOC_EXECUTABLE@ +@qt_gui_true@@pkg_config_true@qt_RPATHCMD = @qt_RPATHCMD@ @wxwidgets_true@@pkg_config_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \ @wxwidgets_true@@pkg_config_true@ wxPLplotDemo$(EXEEXT) +@qt_gui_true@@pkg_config_true@qt_gui_EXECUTABLES_list = \ +@qt_gui_true@@pkg_config_true@ qt_example$(EXEEXT) + EXECUTABLES_list = \ x01cc$(EXEEXT) \ x01$(EXEEXT) \ @@ -64,8 +69,10 @@ x29$(EXEEXT) \ x30$(EXEEXT) \ x31$(EXEEXT) \ - $(PLPLOTWXWIDGETS_EXECUTABLES_list) + $(PLPLOTWXWIDGETS_EXECUTABLES_list) \ + $(qt_gui_EXECUTABLES_list) + all: $(EXECUTABLES_list) clean: @@ -74,6 +81,12 @@ @wxwidgets_true@@pkg_config_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp @wxwidgets_true@@pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets` +@qt_gui_true@@pkg_config_true@moc_qt_PlotWindow.cpp: qt_PlotWindow.h +@qt_gui_true@@pkg_config_true@ $(QT_MOC_EXECUTABLE) `$(PKG_CONFIG_ENV) pkg-config --cflags plplot$(LIB_TAG)-qt` $< -o $@ + +@qt_gui_true@@pkg_config_true@qt_example$(EXEEXT): qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp +@qt_gui_true@@pkg_config_true@ $(CXX) qt_example.cpp qt_PlotWindow.cpp moc_qt_PlotWindow.cpp -o $@ $(qt_RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-qt` + .cc$(EXEEXT): @pkg_config_true@ $(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++` @pkg_config_false@ $(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++` Added: trunk/examples/c++/README.qt_example =================================================================== --- trunk/examples/c++/README.qt_example (rev 0) +++ trunk/examples/c++/README.qt_example 2009-04-18 01:01:29 UTC (rev 9818) @@ -0,0 +1,14 @@ +The files qt_example.cpp, qt_PlotWindow.cpp, and qt_PlotWindow.h contain +source code for a simple example demonstrating how to access the PLplot API +from a Qt GUI application. + +You build this simple Qt example by running + +make qt_example + +Inside the Makefile you will see the details of how this example should be +built including the pkg-config commands that should be run to obtain the +correct arguments for moc and g++. We suggest you follow this simple +pkg-config build method when building your own Qt GUI application which uses +PLplot. + Property changes on: trunk/examples/c++/README.qt_example ___________________________________________________________________ Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |