Changeset 1e0861


Ignore:
Timestamp:
Dec 4, 2010, 11:44:19 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
670cd1
Parents:
87db7a
git-author:
Frederik Heber <heber@…> (11/08/10 16:48:38)
git-committer:
Frederik Heber <heber@…> (12/04/10 23:44:19)
Message:

Qt stuff is not compiled into libMolecuilder but libMolecuilderQtUI.

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    r87db7a r1e0861  
    124124  Thermostats/Thermostat.hpp \
    125125  Thermostats/Woodcock.hpp
    126 
    127 QTUIMOC_HEADER = UIElements/Qt4/QtDialog.hpp \
    128         UIElements/Qt4/QtMainWindow.hpp \
    129   UIElements/Qt4/Pipe/AtomQtQueryPipe.hpp \
    130   UIElements/Qt4/Pipe/AtomsQtQueryPipe.hpp \
    131   UIElements/Qt4/Pipe/BooleanQtQueryPipe.hpp \
    132   UIElements/Qt4/Pipe/BoxQtQueryPipe.hpp \
    133   UIElements/Qt4/Pipe/DoubleQtQueryPipe.hpp \
    134   UIElements/Qt4/Pipe/ElementsQtQueryPipe.hpp \
    135   UIElements/Qt4/Pipe/EmptyQtQueryPipe.hpp \
    136   UIElements/Qt4/Pipe/ElementQtQueryPipe.hpp \
    137   UIElements/Qt4/Pipe/FileQtQueryPipe.hpp \
    138   UIElements/Qt4/Pipe/IntQtQueryPipe.hpp \
    139   UIElements/Qt4/Pipe/MoleculeQtQueryPipe.hpp \
    140   UIElements/Qt4/Pipe/MoleculesQtQueryPipe.hpp \
    141   UIElements/Qt4/Pipe/StringQtQueryPipe.hpp \
    142   UIElements/Qt4/Pipe/VectorQtQueryPipe.hpp \
    143   UIElements/Qt4/Pipe/VectorsQtQueryPipe.hpp \
    144         UIElements/Menu/Qt4/QtMenuPipe.hpp \
    145         UIElements/Views/Qt4/QtWorldView.hpp \
    146         UIElements/Views/Qt4/GLMoleculeView.hpp \
    147         UIElements/Views/Qt4/QtMoleculeView.hpp \
    148         UIElements/Views/Qt4/QtStatusBar.hpp
    149                                  
    150 QTUISOURCE = allmocs.moc.cpp \
    151   UIElements/Qt4/Pipe/AtomQtQueryPipe.cpp \
    152   UIElements/Qt4/Pipe/AtomsQtQueryPipe.cpp \
    153   UIElements/Qt4/Pipe/BooleanQtQueryPipe.cpp \
    154   UIElements/Qt4/Pipe/BoxQtQueryPipe.cpp \
    155   UIElements/Qt4/Pipe/DoubleQtQueryPipe.cpp \
    156   UIElements/Qt4/Pipe/ElementsQtQueryPipe.cpp \
    157   UIElements/Qt4/Pipe/EmptyQtQueryPipe.cpp \
    158   UIElements/Qt4/Pipe/ElementQtQueryPipe.cpp \
    159   UIElements/Qt4/Pipe/FileQtQueryPipe.cpp \
    160   UIElements/Qt4/Pipe/IntQtQueryPipe.cpp \
    161   UIElements/Qt4/Pipe/MoleculeQtQueryPipe.cpp \
    162   UIElements/Qt4/Pipe/MoleculesQtQueryPipe.cpp \
    163   UIElements/Qt4/Pipe/StringQtQueryPipe.cpp \
    164   UIElements/Qt4/Pipe/VectorQtQueryPipe.cpp \
    165   UIElements/Qt4/Pipe/VectorsQtQueryPipe.cpp \
    166   UIElements/Qt4/Query/AtomQtQuery.cpp \
    167   UIElements/Qt4/Query/AtomsQtQuery.cpp \
    168   UIElements/Qt4/Query/BooleanQtQuery.cpp \
    169   UIElements/Qt4/Query/BoxQtQuery.cpp \
    170   UIElements/Qt4/Query/DoubleQtQuery.cpp \
    171   UIElements/Qt4/Query/DoublesQtQuery.cpp \
    172   UIElements/Qt4/Query/ElementQtQuery.cpp \
    173   UIElements/Qt4/Query/ElementsQtQuery.cpp \
    174   UIElements/Qt4/Query/EmptyQtQuery.cpp \
    175   UIElements/Qt4/Query/FileQtQuery.cpp \
    176   UIElements/Qt4/Query/IntQtQuery.cpp \
    177   UIElements/Qt4/Query/IntsQtQuery.cpp \
    178   UIElements/Qt4/Query/MoleculeQtQuery.cpp \
    179   UIElements/Qt4/Query/MoleculesQtQuery.cpp \
    180   UIElements/Qt4/Query/StringQtQuery.cpp \
    181   UIElements/Qt4/Query/StringsQtQuery.cpp \
    182   UIElements/Qt4/Query/VectorQtQuery.cpp \
    183   UIElements/Qt4/Query/VectorsQtQuery.cpp \
    184         UIElements/Qt4/QtMainWindow.cpp \
    185         UIElements/Qt4/QtDialog.cpp \
    186         UIElements/Qt4/QtUIFactory.cpp \
    187         UIElements/Menu/Qt4/QtMenuPipe.cpp \
    188         UIElements/Views/Qt4/QtWorldView.cpp \
    189         UIElements/Views/Qt4/GLMoleculeView.cpp \
    190         UIElements/Views/Qt4/QtMoleculeView.cpp \
    191         UIElements/Views/Qt4/QtStatusBar.cpp
    192              
    193 QTUIHEADER = \
    194   ${QTUIMOC_HEADER} \
    195         UIElements/Menu/Qt4/QtDialog.hpp \
    196         UIElements/Menu/Qt4/QtMenu.hpp \
    197         UIElements/Menu/Qt4/Query/QtQuery.hpp \
    198   UIElements/Qt4/QtUIFactory.hpp \
    199   UIElements/Qt4/Pipe/QtQueryListPipe.hpp
    200 
    201 QTUI_DEFS =
    202126
    203127TESSELATIONSOURCE = \
    … …  
    375299
    376300#Stuff for building the GUI using Qt
    377 molecuildergui_SOURCES = ${QTUISOURCE} builder.cpp
     301molecuildergui_SOURCES = builder.cpp
    378302molecuildergui_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} -DUSE_GUI_QT
    379303molecuildergui_LDFLAGS = $(BOOST_LIB) ${QT_LDFLAGS} ${GLU_LDFLAGS}
    … …  
    384308molecuildergui_LDADD = \
    385309        UIElements/libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
     310        UIElements/libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la \
    386311        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la \
    387312        libMolecuilder-@MOLECUILDER_API_VERSION@.la \
    … …  
    414339        Helpers/libMolecuilderHelpers-@MOLECUILDER_API_VERSION@.la \
    415340        $(BOOST_LIB)
    416 
    417 #Rules needed for Qt4
    418 # UI-Files are scattered throughout several subdirectories
    419 # Therfore `%'-rules do not seem to work
    420 #Quick fix to get it done otherwise
    421 allmocs.moc.cpp: ${QTUIMOC_HEADER}
    422         echo "" > allmocs.moc.cpp;\
    423         list='$(QTUIMOC_HEADER)'; for header in $$list; do \
    424         echo "Making mocfile for $$header"; \
    425         target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
    426         $(MOC) $(srcdir)/$$header -o $$target \
    427         || eval $$failcom; \
    428         echo "#include \"$$target\"" >> allmocs.moc.cpp; \
    429         done;
    430341
    431342#EXTRA_DIST = ${molecuilder_DATA}

  • src/UIElements/Makefile.am

    r87db7a r1e0861  
    33INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
    44
    5 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
    6 AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
     5AM_LDFLAGS = -ldl
     6AM_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS}
    77
    88VIEWSOURCE = \
    … …  
    151151  CommandLineUI/TypeEnumContainer.cpp
    152152
    153 lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la
     153QTUIMOC_HEADER = \
     154        Qt4/QtDialog.hpp \
     155        Qt4/QtMainWindow.hpp \
     156  Qt4/Pipe/AtomQtQueryPipe.hpp \
     157  Qt4/Pipe/AtomsQtQueryPipe.hpp \
     158  Qt4/Pipe/BooleanQtQueryPipe.hpp \
     159  Qt4/Pipe/BoxQtQueryPipe.hpp \
     160  Qt4/Pipe/DoubleQtQueryPipe.hpp \
     161  Qt4/Pipe/ElementsQtQueryPipe.hpp \
     162  Qt4/Pipe/EmptyQtQueryPipe.hpp \
     163  Qt4/Pipe/ElementQtQueryPipe.hpp \
     164  Qt4/Pipe/FileQtQueryPipe.hpp \
     165  Qt4/Pipe/IntQtQueryPipe.hpp \
     166  Qt4/Pipe/MoleculeQtQueryPipe.hpp \
     167  Qt4/Pipe/MoleculesQtQueryPipe.hpp \
     168  Qt4/Pipe/StringQtQueryPipe.hpp \
     169  Qt4/Pipe/VectorQtQueryPipe.hpp \
     170  Qt4/Pipe/VectorsQtQueryPipe.hpp \
     171        Menu/Qt4/QtMenuPipe.hpp \
     172        Views/Qt4/QtWorldView.hpp \
     173        Views/Qt4/GLMoleculeView.hpp \
     174        Views/Qt4/QtMoleculeView.hpp \
     175        Views/Qt4/QtStatusBar.hpp
     176                                 
     177QTUISOURCE = allmocs.moc.cpp \
     178  Qt4/Pipe/AtomQtQueryPipe.cpp \
     179  Qt4/Pipe/AtomsQtQueryPipe.cpp \
     180  Qt4/Pipe/BooleanQtQueryPipe.cpp \
     181  Qt4/Pipe/BoxQtQueryPipe.cpp \
     182  Qt4/Pipe/DoubleQtQueryPipe.cpp \
     183  Qt4/Pipe/ElementsQtQueryPipe.cpp \
     184  Qt4/Pipe/EmptyQtQueryPipe.cpp \
     185  Qt4/Pipe/ElementQtQueryPipe.cpp \
     186  Qt4/Pipe/FileQtQueryPipe.cpp \
     187  Qt4/Pipe/IntQtQueryPipe.cpp \
     188  Qt4/Pipe/MoleculeQtQueryPipe.cpp \
     189  Qt4/Pipe/MoleculesQtQueryPipe.cpp \
     190  Qt4/Pipe/StringQtQueryPipe.cpp \
     191  Qt4/Pipe/VectorQtQueryPipe.cpp \
     192  Qt4/Pipe/VectorsQtQueryPipe.cpp \
     193  Qt4/Query/AtomQtQuery.cpp \
     194  Qt4/Query/AtomsQtQuery.cpp \
     195  Qt4/Query/BooleanQtQuery.cpp \
     196  Qt4/Query/BoxQtQuery.cpp \
     197  Qt4/Query/DoubleQtQuery.cpp \
     198  Qt4/Query/DoublesQtQuery.cpp \
     199  Qt4/Query/ElementQtQuery.cpp \
     200  Qt4/Query/ElementsQtQuery.cpp \
     201  Qt4/Query/EmptyQtQuery.cpp \
     202  Qt4/Query/FileQtQuery.cpp \
     203  Qt4/Query/IntQtQuery.cpp \
     204  Qt4/Query/IntsQtQuery.cpp \
     205  Qt4/Query/MoleculeQtQuery.cpp \
     206  Qt4/Query/MoleculesQtQuery.cpp \
     207  Qt4/Query/StringQtQuery.cpp \
     208  Qt4/Query/StringsQtQuery.cpp \
     209  Qt4/Query/VectorQtQuery.cpp \
     210  Qt4/Query/VectorsQtQuery.cpp \
     211        Qt4/QtMainWindow.cpp \
     212        Qt4/QtDialog.cpp \
     213        Qt4/QtUIFactory.cpp \
     214        Menu/Qt4/QtMenuPipe.cpp \
     215        Views/Qt4/QtWorldView.cpp \
     216        Views/Qt4/GLMoleculeView.cpp \
     217        Views/Qt4/QtMoleculeView.cpp \
     218        Views/Qt4/QtStatusBar.cpp
     219             
     220QTUIHEADER = \
     221  ${QTUIMOC_HEADER} \
     222        Menu/Qt4/QtMenu.hpp \
     223        Qt4/Query/QtQuery.hpp \
     224  Qt4/QtUIFactory.hpp \
     225  Qt4/Pipe/QtQueryListPipe.hpp
     226
     227QTUI_DEFS =
     228
     229
     230
     231lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
     232        libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la
    154233libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
     234libMolecuilderQtUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
    155235libMolecuilderUI_LIBS = \
    156236        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
     237libMolecuilderQtUI_LIBS = \
     238        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
    157239
    158240nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
     241nobase_libMolecuilderQtUI_include_HEADERS = ${QTUIHEADER}
    159242
    160243## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
    … …  
    167250## which are already listed elsewhere in a _HEADERS variable assignment.
    168251libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
     252libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${QTUISOURCE}
    169253
    170254## Instruct libtool to include ABI version information in the generated shared
    … …  
    172256## that all version information is kept in one place.
    173257libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
     258libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
    174259
    175260## The generated configuration header is installed in its own subdirectory of
    … …  
    185270## shipped with the source tarball.
    186271libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
     272libMolecuilderQtUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
    187273nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
     274nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
    188275
    189276## Install the generated pkg-config file (.pc) into the expected location for
    … …  
    200287        done;
    201288       
     289#Rules needed for Qt4
     290# UI-Files are scattered throughout several subdirectories
     291# Therfore `%'-rules do not seem to work
     292#Quick fix to get it done otherwise
     293allmocs.moc.cpp: ${QTUIMOC_HEADER}
     294        echo "" > allmocs.moc.cpp;\
     295        list='$(QTUIMOC_HEADER)'; for header in $$list; do \
     296        echo "Making mocfile for $$header"; \
     297        target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
     298        $(MOC) $(srcdir)/$$header -o $$target \
     299        || eval $$failcom; \
     300        echo "#include \"$$target\"" >> allmocs.moc.cpp; \
     301        done;
     302
     303       
    202304MOSTLYCLEANFILES = unity.cpp
Note: See TracChangeset for help on using the changeset viewer.