Changeset c015b3 for src/UIElements

Timestamp:

Dec 28, 2011, 3:24:57 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:

db1a72

Parents:

f3b8a5

git-author:

Frederik Heber <heber@…> (11/11/11 12:16:24)

git-committer:

Frederik Heber <heber@…> (12/28/11 15:24:57)

Message:

Added enable-switches for Qt-based GUI and python module and scripts.

• note that encapsulation in AS_IF is absolutely required as otherwise lateron checks will produce strange errors as required checks reside in an unseen if ..; then branch, initiated by AC_PROG() ... or other contained macros.
• Added AM_CONDITIIONAL's to modify Makefile.ams depending on above enable switches.
• AM_COND_IF controls whether certain Makefile's are produced or not.
• moved Python regression tests into own folder to control whether they are executed or not.
• molecuildergui and libMolecuilderQtUI are only compiled with qtgui enabled.
• same for pyMoleCuilder and its scripts only when python enabled.

File:

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

src/UIElements/Makefile.am

@@ -250 +250 @@
   UIElements/Qt4/Pipe/QtQueryListPipe.hpp
 
-lib_LTLIBRARIES += libMolecuilderUI.la \
-  libMolecuilderQtUI.la
+lib_LTLIBRARIES += libMolecuilderUI.la
 libMolecuilderUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
-libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
 libMolecuilderUI_la_CPPFLAGS = ${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)
+
 # NOTE: ActionPrototypes BEFORE Actions!
 # this is to ensure that static Action prototypes are instantiated after
@@ -280 +277 @@
         $(BOOST_SYSTEM_LDFLAGS) $(BOOST_SYSTEM_LIBS)
 
-libMolecuilderQtUI_la_LIBADD = \
-        ${QT_LIBS} \
-        -lQtOpenGL \
-        ${GLU_LIBS}
-
-
 nobase_libMolecuilderUI_la_include_HEADERS = ${UIHEADER}
-nobase_libMolecuilderQtUI_la_include_HEADERS = ${QTUIHEADER} $(QTUIUI_UIFILES)
 
 ## Define the source file list for the "libexample-@MOLECUILDER_API_VERSION@.la"
@@ -298 +288 @@
 ## which are already listed elsewhere in a _HEADERS variable assignment.
 libMolecuilderUI_la_SOURCES = ${UISOURCE}
-libMolecuilderQtUI_la_SOURCES = ${QTUISOURCE}
-nodist_libMolecuilderQtUI_la_SOURCES =
 
 ## Instruct libtool to include ABI version information in the generated shared
@@ -305 +293 @@
 ## that all version information is kept in one place.
 libMolecuilderUI_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
-libMolecuilderQtUI_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
 
 ## The generated configuration header is installed in its own subdirectory of
@@ -319 +306 @@
 ## shipped with the source tarball.
 #libMolecuilderUI_libincludedir = $(libdir)/MoleCuilder/include
-#libMolecuilderQtUI_libincludedir = $(libdir)/MoleCuilder/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
@@ -330 +315 @@
 #pkgconfig_DATA = $(top_builddir)/MoleCuilder.pc
 
-# This is the old stuff from branch molecuilderGUI which does not work
-#%.h: %.ui
-#       $(UIC) -o $@ $<
-#       
-#%.cpp: %.ui
-#       $(UIC) -o $@ -impl $*.h $<
+if CONDQTGUI
+lib_LTLIBRARIES += libMolecuilderQtUI.la
+
+libMolecuilderQtUI_la_includedir = $(includedir)/MoleCuilder/UIElements/
+libMolecuilderQtUI_la_CPPFLAGS = ${QT_CFLAGS} ${GLU_CXXFLAGS} ${BOOST_CPPFLAGS} ${CodePatterns_CFLAGS}
+libMolecuilderQtUI_la_LDFLAGS = $(AM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LDFLAGS) $(BOOST_RANDOM_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_THREAD_LDFLAGS)
+
+libMolecuilderQtUI_la_LIBADD = \
+        ${QT_LIBS} \
+        -lQtOpenGL \
+        ${GLU_LIBS}
+
+nobase_libMolecuilderQtUI_la_include_HEADERS = ${QTUIHEADER} $(QTUIUI_UIFILES)
+libMolecuilderQtUI_la_SOURCES = ${QTUISOURCE}
+nodist_libMolecuilderQtUI_la_SOURCES =
+libMolecuilderQtUI_la_LDFLAGS += -version-info $(MOLECUILDER_SO_VERSION)
+#libMolecuilderQtUI_libincludedir = $(libdir)/MoleCuilder/include
+#nodist_libMolecuilderQtUI_libinclude_HEADERS = $(top_builddir)/libmolecuilder_config.h
 
 BUILT_SOURCES += ui_dialoglight.h ui_changeposition.h
 
-#noinst_HEADERS = dialoglight.h changeposition.h
-
 nodist_libMolecuilderQtUI_la_SOURCES += moc_dialoglight.cpp moc_changeposition.cpp
 
-#libMolecuilderQtUI_la_SOURCES += dialoglight.cpp changeposition.cpp
+MOSTLYCLEANFILES += \
+        *.moc.cpp \
+        moc_*.cpp \
+        ui_*.h
 
 ui_dialoglight.h: UIElements/Views/Qt4/dialoglight.ui
@@ -373 +371 @@
         done;
 
-MOSTLYCLEANFILES += \
-        *.moc.cpp \
-        moc_*.cpp \
-        ui_*.h
-
+endif