Merge pull request opencog#12 from opencog/port-fitnesseval

Port fitnesseval logical_bscore
behailu04 · Sep 25, 2018 · 986ba56 · 986ba56
2 parents c8a9f8f + 8f4bf62
commit 986ba56
Show file tree

Hide file tree

Showing 35 changed files with 4,398 additions and 3,801 deletions.
diff --git a/moses/CMakeLists.txt b/moses/CMakeLists.txt
@@ -1,8 +1,8 @@
-
 ADD_SUBDIRECTORY (comboreduct)
 ADD_SUBDIRECTORY (moses)
 ADD_SUBDIRECTORY (feature-selection)
 ADD_SUBDIRECTORY (atomese)
+ADD_SUBDIRECTORY (data)
 
 # Currently, the pleasure code does not build, as it uses various
 # obsolete combo types and routines and etc.  It needs to be ported

diff --git a/moses/atomese/CMakeLists.txt b/moses/atomese/CMakeLists.txt
@@ -1,13 +1,10 @@
-ADD_SUBDIRECTORY(representation)
 ADD_SUBDIRECTORY(interpreter)
 
 ADD_LIBRARY(atomese SHARED
-		representation/load_table
 		interpreter/Interpreter
 )
 
 TARGET_LINK_LIBRARIES (atomese
-	ascomboreduct
 	${COGUTIL_LIBRARY}
 	${ATOMSPACE_LIBRARIES}
 )
@@ -17,6 +14,7 @@ IF (WIN32)
 	INSTALL(TARGETS atomese DESTINATION "lib${LIB_DIR_SUFFIX}/moses")
 ELSE (WIN32)
 	INSTALL(TARGETS atomese
+			EXPORT ASMosesTargets
 			LIBRARY DESTINATION "lib${LIB_DIR_SUFFIX}"   # lib*.so files
 			ARCHIVE DESTINATION "lib${LIB_DIR_SUFFIX}")  # lib*.a files
 ENDIF (WIN32)
diff --git a/moses/atomese/representation/CMakeLists.txt b/moses/atomese/representation/CMakeLists.txt
diff --git a/moses/comboreduct/CMakeLists.txt b/moses/comboreduct/CMakeLists.txt
@@ -65,6 +65,7 @@ ADD_LIBRARY(ascomboreduct SHARED
 )
 
 TARGET_LINK_LIBRARIES (ascomboreduct
+	atomese
 	${COGUTIL_LIBRARY}
 	${Boost_DATE_TIME_LIBRARY}
 	${Boost_THREAD_LIBRARY}