Changeset 1e0861 for src/UIElements

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.

File:

• src/UIElements/Makefile.am (modified) (6 diffs)

src/UIElements/Makefile.am

@@ -3 +3 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/UIElements
 
-AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl
-AM_CXXFLAGS = $(CPPUNIT_CFLAGS)
+AM_LDFLAGS = -ldl
+AM_CXXFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS}
 
 VIEWSOURCE = \
@@ -151 +151 @@
   CommandLineUI/TypeEnumContainer.cpp
 
-lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la
+QTUIMOC_HEADER = \
+        Qt4/QtDialog.hpp \
+        Qt4/QtMainWindow.hpp \
+  Qt4/Pipe/AtomQtQueryPipe.hpp \
+  Qt4/Pipe/AtomsQtQueryPipe.hpp \
+  Qt4/Pipe/BooleanQtQueryPipe.hpp \
+  Qt4/Pipe/BoxQtQueryPipe.hpp \
+  Qt4/Pipe/DoubleQtQueryPipe.hpp \
+  Qt4/Pipe/ElementsQtQueryPipe.hpp \
+  Qt4/Pipe/EmptyQtQueryPipe.hpp \
+  Qt4/Pipe/ElementQtQueryPipe.hpp \
+  Qt4/Pipe/FileQtQueryPipe.hpp \
+  Qt4/Pipe/IntQtQueryPipe.hpp \
+  Qt4/Pipe/MoleculeQtQueryPipe.hpp \
+  Qt4/Pipe/MoleculesQtQueryPipe.hpp \
+  Qt4/Pipe/StringQtQueryPipe.hpp \
+  Qt4/Pipe/VectorQtQueryPipe.hpp \
+  Qt4/Pipe/VectorsQtQueryPipe.hpp \
+        Menu/Qt4/QtMenuPipe.hpp \
+        Views/Qt4/QtWorldView.hpp \
+        Views/Qt4/GLMoleculeView.hpp \
+        Views/Qt4/QtMoleculeView.hpp \
+        Views/Qt4/QtStatusBar.hpp
+                                  
+QTUISOURCE = allmocs.moc.cpp \
+  Qt4/Pipe/AtomQtQueryPipe.cpp \
+  Qt4/Pipe/AtomsQtQueryPipe.cpp \
+  Qt4/Pipe/BooleanQtQueryPipe.cpp \
+  Qt4/Pipe/BoxQtQueryPipe.cpp \
+  Qt4/Pipe/DoubleQtQueryPipe.cpp \
+  Qt4/Pipe/ElementsQtQueryPipe.cpp \
+  Qt4/Pipe/EmptyQtQueryPipe.cpp \
+  Qt4/Pipe/ElementQtQueryPipe.cpp \
+  Qt4/Pipe/FileQtQueryPipe.cpp \
+  Qt4/Pipe/IntQtQueryPipe.cpp \
+  Qt4/Pipe/MoleculeQtQueryPipe.cpp \
+  Qt4/Pipe/MoleculesQtQueryPipe.cpp \
+  Qt4/Pipe/StringQtQueryPipe.cpp \
+  Qt4/Pipe/VectorQtQueryPipe.cpp \
+  Qt4/Pipe/VectorsQtQueryPipe.cpp \
+  Qt4/Query/AtomQtQuery.cpp \
+  Qt4/Query/AtomsQtQuery.cpp \
+  Qt4/Query/BooleanQtQuery.cpp \
+  Qt4/Query/BoxQtQuery.cpp \
+  Qt4/Query/DoubleQtQuery.cpp \
+  Qt4/Query/DoublesQtQuery.cpp \
+  Qt4/Query/ElementQtQuery.cpp \
+  Qt4/Query/ElementsQtQuery.cpp \
+  Qt4/Query/EmptyQtQuery.cpp \
+  Qt4/Query/FileQtQuery.cpp \
+  Qt4/Query/IntQtQuery.cpp \
+  Qt4/Query/IntsQtQuery.cpp \
+  Qt4/Query/MoleculeQtQuery.cpp \
+  Qt4/Query/MoleculesQtQuery.cpp \
+  Qt4/Query/StringQtQuery.cpp \
+  Qt4/Query/StringsQtQuery.cpp \
+  Qt4/Query/VectorQtQuery.cpp \
+  Qt4/Query/VectorsQtQuery.cpp \
+        Qt4/QtMainWindow.cpp \
+        Qt4/QtDialog.cpp \
+        Qt4/QtUIFactory.cpp \
+        Menu/Qt4/QtMenuPipe.cpp \
+        Views/Qt4/QtWorldView.cpp \
+        Views/Qt4/GLMoleculeView.cpp \
+        Views/Qt4/QtMoleculeView.cpp \
+        Views/Qt4/QtStatusBar.cpp
+             
+QTUIHEADER = \
+  ${QTUIMOC_HEADER} \
+        Menu/Qt4/QtMenu.hpp \
+        Qt4/Query/QtQuery.hpp \
+  Qt4/QtUIFactory.hpp \
+  Qt4/Pipe/QtQueryListPipe.hpp
+
+QTUI_DEFS =
+
+
+
+lib_LTLIBRARIES = libMolecuilderUI-@MOLECUILDER_API_VERSION@.la \
+        libMolecuilderQtUI-@MOLECUILDER_API_VERSION@.la
 libMolecuilderUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/
+libMolecuilderQtUI_includedir = $(includedir)/molecuilder-$(MOLECUILDER_API_VERSION)/Actions/ 
 libMolecuilderUI_LIBS = \
         Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
+libMolecuilderQtUI_LIBS = \
+        Actions/libMolecuilderActions-@MOLECUILDER_API_VERSION@.la
 
 nobase_libMolecuilderUI_include_HEADERS = ${UIHEADER}
+nobase_libMolecuilderQtUI_include_HEADERS = ${QTUIHEADER}
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -167 +250 @@
 ## which are already listed elsewhere in a _HEADERS variable assignment.
 libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${UISOURCE}
+libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_SOURCES = ${QTUISOURCE}
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -172 +256 @@
 ## that all version information is kept in one place.
 libMolecuilderUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
+libMolecuilderQtUI_@MOLECUILDER_API_VERSION@_la_LDFLAGS = -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -185 +270 @@
 ## shipped with the source tarball.
 libMolecuilderUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
+libMolecuilderQtUI_libincludedir = $(libdir)/molecuilder-$(MOLECUILDER_API_VERSION)/include
 nodist_libMolecuilderUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
+nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
 
 ## Install the generated pkg-config file (.pc) into the expected location for
@@ -200 +287 @@
         done;
         
+#Rules needed for Qt4
+# UI-Files are scattered throughout several subdirectories
+# Therfore `%'-rules do not seem to work
+#Quick fix to get it done otherwise
+allmocs.moc.cpp: ${QTUIMOC_HEADER}
+        echo "" > allmocs.moc.cpp;\
+        list='$(QTUIMOC_HEADER)'; for header in $$list; do \
+        echo "Making mocfile for $$header"; \
+        target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
+        $(MOC) $(srcdir)/$$header -o $$target \
+        || eval $$failcom; \
+        echo "#include \"$$target\"" >> allmocs.moc.cpp; \
+        done;
+
+        
 MOSTLYCLEANFILES = unity.cpp