Changeset e5cec4

Timestamp:

Nov 4, 2011, 3:20:21 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:

13c969

Parents:

22db89

git-author:

Frederik Heber <heber@…> (11/02/11 02:25:00)

git-committer:

Frederik Heber <heber@…> (11/04/11 15:20:21)

Message:

Removed macro bnv_have_qt, replaced by pkg-config info.

• executables are searched via AC_PATH_PROGS in PATH or the one given via --with-Qt-bin.

Files:

• configure.ac (modified) (2 diffs)
• m4/bnv_have_qt.m4 (deleted)
• src/UIElements/Makefile.am (modified) (1 diff)

configure.ac

@@ -20 +20 @@
 AC_PROG_CC
 AC_PROG_INSTALL
+
+# Qt programs
+AC_ARG_WITH([Qt-bin],
+        [AC_HELP_STRING([--with-Qt-bin], [give path to Qt binaries])],
+        echo "Looking for binaries in $withval ... "
+        [AC_PATH_PROGS([QT_MOC], 
+                [moc-qt4 moc], 
+                [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])],
+                [$withval]
+        )
+        AC_PATH_PROGS([QT_UIC], 
+                [uic-qt4 uic], 
+                [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])],
+                [$withval]
+        )],
+        [AC_PATH_PROGS([QT_MOC], 
+                [moc-qt4 moc], 
+                [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])]
+        )
+        AC_PATH_PROGS([QT_UIC], 
+                [uic-qt4 uic], 
+                [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])]
+        )]
+)
+PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3D], [
+])
+AC_SUBST([QT_CFLAGS])
+AC_SUBST([QT_LIBS])
 
 # use doxygen
@@ -131 +159 @@
 BOOST_THREADS
 
-#QT4 libraries
-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"])
-
 
 # CodePatterns library (needs corrected ax_codepatterns.m4 for boost compile flags in test) 

src/UIElements/Makefile.am

@@ -255 +255 @@
 libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
 libMolecuilderUI_la_CPPFLAGS = ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
-libMolecuilderQtUI_la_CPPFLAGS = ${QT_CXXFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${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)