Break another circular dependency

And another, for opencog#1673
singnet · Feb 3, 2019 · 872bf0f · 872bf0f
1 parent a96c640
commit 872bf0f
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 21 deletions.
diff --git a/lib/AtomSpaceConfig.cmake.in b/lib/AtomSpaceConfig.cmake.in
@@ -42,7 +42,7 @@ set(ATOMSPACE_LIBRARIES
     clearbox
     lambda
     persist
-    query
+    query-engine
     execution
     ruleengine
     smob

diff --git a/opencog/atoms/execution/CMakeLists.txt b/opencog/atoms/execution/CMakeLists.txt
@@ -19,7 +19,8 @@ ADD_LIBRARY (execution
 ADD_DEPENDENCIES(execution opencog_atom_types)
 
 TARGET_LINK_LIBRARIES(execution
-	query
+	query-engine
+	smob
 	atomspace
 	atombase
 	clearbox

diff --git a/opencog/attentionbank/CMakeLists.txt b/opencog/attentionbank/CMakeLists.txt
@@ -11,8 +11,7 @@ ADD_LIBRARY (attentionbank
 )
 
 TARGET_LINK_LIBRARIES(attentionbank
-#	${NO_AS_NEEDED}
-	query
+	query-engine
 	execution
 	smob
 	atombase

diff --git a/opencog/cython/opencog/CMakeLists.txt b/opencog/cython/opencog/CMakeLists.txt
@@ -183,7 +183,7 @@ ADD_LIBRARY(bindlink_cython
 
 TARGET_LINK_LIBRARIES(bindlink_cython
 	atomspace_cython
-	query
+	query-engine
 	execution
 	${PYTHON_LIBRARIES}
 	${Boost_THREAD_LIBRARY}
@@ -222,7 +222,7 @@ IF (HAVE_GUILE)
 
 	TARGET_LINK_LIBRARIES(scheme_wrapper
 		atomspace_cython
-		query
+		query-engine
 		execution
 		smob
 		${PYTHON_LIBRARIES}

diff --git a/opencog/haskell/CMakeLists.txt b/opencog/haskell/CMakeLists.txt
@@ -6,12 +6,12 @@ ADD_LIBRARY (atomspace-cwrapper
     Value_CWrapper.cpp
 )
 
-ADD_DEPENDENCIES(atomspace-cwrapper atomspace query)
+ADD_DEPENDENCIES(atomspace-cwrapper atomspace query-engine)
 
 TARGET_LINK_LIBRARIES(atomspace-cwrapper
-	atomspace
-	query
+	query-engine
 	execution
+	atomspace
 )
 
 INSTALL (TARGETS atomspace-cwrapper

diff --git a/opencog/query/CMakeLists.txt b/opencog/query/CMakeLists.txt
@@ -1,34 +1,41 @@
 
 # Build the query shlib
-ADD_LIBRARY(query
+ADD_LIBRARY(query-engine
 	DefaultPatternMatchCB.cc
 	Implicator.cc
 	DefaultImplicator.cc
 	InitiateSearchCB.cc
 	PatternMatch.cc
 	PatternMatchEngine.cc
-	PatternSCM.cc
 	Recognizer.cc
 	Satisfier.cc
 )
+ADD_LIBRARY(query
+	PatternSCM.cc
+)
 
-ADD_DEPENDENCIES(query
+ADD_DEPENDENCIES(query-engine
 	opencog_atom_types
 )
 
-TARGET_LINK_LIBRARIES(query
+TARGET_LINK_LIBRARIES(query-engine
 	lambda
 	atomspace
-#	execution # disabled to avoid cyclic dependency
+#	execution # still a circular dependency
+)
+
+TARGET_LINK_LIBRARIES(query
+	query-engine
+	smob
 )
 
-IF (HAVE_GUILE)
-	TARGET_LINK_LIBRARIES(query smob)
-ENDIF (HAVE_GUILE)
+INSTALL (TARGETS query-engine
+	EXPORT AtomSpaceTargets
+	DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
 
-INSTALL (TARGETS query 
-    EXPORT AtomSpaceTargets 
-    DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
+INSTALL (TARGETS query
+	EXPORT AtomSpaceTargets
+	DESTINATION "lib${LIB_DIR_SUFFIX}/opencog")
 
 INSTALL (FILES
 	BindLinkAPI.h

diff --git a/opencog/rule-engine/CMakeLists.txt b/opencog/rule-engine/CMakeLists.txt
@@ -26,7 +26,7 @@ ADD_DEPENDENCIES(ruleengine
 
 TARGET_LINK_LIBRARIES(ruleengine
 	lambda
-	query
+	query-engine
 	execution
 	atomspace
 	atomspaceutils