Changeset 26dc12

Timestamp:

Mar 2, 2017, 7:17:41 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

3dd6a5

Parents:

53ef0d4

git-author:

Frederik Heber <heber@…> (11/15/16 20:59:39)

git-committer:

Frederik Heber <heber@…> (03/02/17 07:17:41)

Message:

Modified check for CodePatterns presence in configure.ac's.

• this affects MoleCuilder and LinearAlgebra.

Files:

• Makefile.am (modified) (1 diff)
• ThirdParty/LinearAlgebra/configure.ac (modified) (1 diff)
• configure.ac (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = ThirdParty/LinearAlgebra data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
+
+SUBDIRS=
+if COND_COMPILE_CODEPATTERNS
+SUBDIRS += ThirdParty/CodePatterns
+endif
+SUBDIRS += ThirdParty/LinearAlgebra data/icons src src/unittests src/Tesselation/TriangleMatcher src/Bond/AdjacencyMatcher tests utils doc
 
 AUTOMAKE_OPTIONS = subdir-objects

ThirdParty/LinearAlgebra/configure.ac

@@ -90 +90 @@
 
 # CodePatterns library (serialization header before MemDebug.hpp ) 
-AM_PATH_CODEPATTERNS([1.1.5], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+AM_PATH_CODEPATTERNS([1.3.2], $have_debug,,[
+        # compile from ThirdParty
+        #AC_DEFINE(COMPILE_CODEPATTERNS,1, ["compile internal codepatterns library."])
+        [CodePatterns_LDFLAGS='-L$(top_builddir)/../CodePatterns/src']
+        [CodePatterns_CFLAGS='-I$(top_srcdir)/../CodePatterns/src']
+        AS_IF([test x"$enable_debug" != x"no"], [
+                [CodePatterns_LIBS='-lcodepatterns-debug']
+        ],[
+                [CodePatterns_LIBS='-lcodepatterns']
+        ])
+        AC_SUBST(CodePatterns_LDFLAGS)
+        AC_SUBST(CodePatterns_CFLAGS)
+        AC_SUBST(CodePatterns_LIBS)
+        #AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])
+])
 
 # boost

configure.ac

@@ -258 +258 @@
 
 # CodePatterns library (requiring UnobservedIterator)
-AM_PATH_CODEPATTERNS([1.3.1], $have_debug,,[AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])])
+compile_codepatterns="no"
+AM_PATH_CODEPATTERNS([1.3.2], $have_debug,,[
+        # compile from ThirdParty
+        AC_CONFIG_SUBDIRS([ThirdParty/CodePatterns])
+        compile_codepatterns="yes"
+        [CodePatterns_LDFLAGS='-L$(top_builddir)/ThirdParty/CodePatterns/src']
+        [CodePatterns_CFLAGS='-I$(top_srcdir)/ThirdParty/CodePatterns/src']
+        AS_IF([test x"$enable_debug" != x"no"], [
+                [CodePatterns_LIBS='-lcodepatterns-debug']
+        ],[
+                [CodePatterns_LIBS='-lcodepatterns']
+        ])
+        AC_SUBST(CodePatterns_LDFLAGS)
+        AC_SUBST(CodePatterns_CFLAGS)
+        AC_SUBST(CodePatterns_LIBS)
+        #AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])
+])
+AM_CONDITIONAL([COND_COMPILE_CODEPATTERNS], [test x"$compile_codepatterns" = x"yes"])
 
 # JobMarket library (needs boost/archive/iserializer.hpp before MemDebug.hpp)