Changeset 060ba4

Timestamp:

Oct 6, 2011, 12:08:31 PM (13 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:

d238e7

Parents:

bd8788

git-author:

Frederik Heber <heber@…> (08/26/11 14:28:48)

git-committer:

Frederik Heber <heber@…> (10/06/11 12:08:31)

Message:

Replaced m4 macro gwqt4.m4 by bnv_have_qt.m4

• as is used with seismolo.
• @MOC@ -> QTMOC, @UIC@ -> QT_UIC.
• QT_LIBS has it all.
• new QT_DEBUG when Qt debug should be printed or not.

Files:

• configure.ac (modified) (2 diffs)
• m4/bnv_have_qt.m4 (added)
• m4/gwqt4.m4 (deleted)
• src/UIElements/Makefile.am (modified) (5 diffs)

configure.ac

@@ -56 +56 @@
   AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
   AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
+  AC_DEFINE(QT_DEBUG,, ["Enable Qt debug messages."])
   have_debug="full"
 else
   AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
   AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
+  AC_DEFINE(QT_NO_DEBUG,, ["Disable Qt debug messages."])
   have_debug="no"
 fi
@@ -119 +121 @@
 
 #QT4 libraries
-gw_CHECK_QT4
-AX_CHECK_GLU
+BNV_HAVE_QT
+#gw_CHECK_QT4
+#AX_CHECK_GLU
 #AC_MSG_NOTICE(["GLU_CFLAGS: $GLU_CFLAGS, GLU_CXXFLAGS: $GLU_CXXFLAGS, GLU_LDFLAGS: $GLU_LDFLAGS, GLU_LIBS: $GLU_LIBS"])
 

src/UIElements/Makefile.am

@@ -237 +237 @@
 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
-libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
-libMolecuilderQtUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS} ${QT_CXXFLAGS}
+libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderQtUI_la_CPPFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
 libMolecuilderUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
 libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
@@ -259 +259 @@
 
 libMolecuilderQtUI_la_LIBADD = \
-       ${QT_LIB_GUI} \
+       ${QT_LIBS} \
        -lQtOpenGL \
-       ${GLU_LIBS} \
-       ${QT_LDADD}
+       ${GLU_LIBS}
 
 
@@ -278 +277 @@
 libMolecuilderUI_la_SOURCES = ${UISOURCE}
 libMolecuilderQtUI_la_SOURCES = ${QTUISOURCE}
-nodist_libMolecuilderQtUI_la_SOURCES = allmocs.moc.cpp
+nodist_libMolecuilderQtUI_la_SOURCES =
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -325 +324 @@
 
 ui_dialoglight.h: UIElements/Views/Qt4/dialoglight.ui
-        @UIC@ -o $@ $<
+        $(QT_UIC) -o $@ $<
 
 ui_changeposition.h: UIElements/Views/Qt4/changeposition.ui
-        @UIC@ -o $@ $<
+        $(QT_UIC) -o $@ $<
 
 moc_dialoglight.cpp: ui_dialoglight.h
-        @MOC@ -o $@ $<
+        $(QT_MOC) -o $@ $<
 
 moc_changeposition.cpp: ui_changeposition.h
-        @MOC@ -o $@ $<
+        $(QT_MOC) -o $@ $<
+
+nodist_libMolecuilderQtUI_la_SOURCES += allmocs.moc.cpp
 
 #Rules needed for Qt4
@@ -345 +346 @@
         echo "Making mocfile for $$header"; \
         target=`basename $$header | sed "s/\(.*\)\..*/\1.moc.cpp/"`;\
-        $(MOC) $(srcdir)/$$header -o $$target \
+        $(QT_MOC) $(srcdir)/$$header -o $$target \
         || eval $$failcom; \
         echo "#include \"$$target\"" >> allmocs.moc.cpp; \