Skip to content
Snippets Groups Projects
Commit c2c34065 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

fixed build error

parent 9cb51b58
No related branches found
No related tags found
2 merge requests!140armem/dev -> master,!136Memory structure changes, query_proc structure changes (Base classes / templated)
...@@ -3,11 +3,12 @@ set(LIB_NAME armem) ...@@ -3,11 +3,12 @@ set(LIB_NAME armem)
armarx_component_set_name("${LIB_NAME}") armarx_component_set_name("${LIB_NAME}")
armarx_set_target("Library: ${LIB_NAME}") armarx_set_target("Library: ${LIB_NAME}")
set(LIBS set(LIBS
ArmarXCoreInterfaces ArmarXCore ArmarXCoreInterfaces ArmarXCore
RemoteGui RemoteGui
aron aron
${LIBMONGOCXX_LIBRARIES}
${LIBBSONCXX_LIBRARIES}
) )
set(ARON_FILES set(ARON_FILES
...@@ -49,6 +50,13 @@ set(LIB_FILES ...@@ -49,6 +50,13 @@ set(LIB_FILES
core/longtermMemory/Memory.cpp core/longtermMemory/Memory.cpp
core/longtermMemory/ProviderSegment.cpp core/longtermMemory/ProviderSegment.cpp
core/diskMemory/CoreSegment.cpp
core/diskMemory/Entity.cpp
core/diskMemory/EntityInstance.cpp
core/diskMemory/EntitySnapshot.cpp
core/diskMemory/Memory.cpp
core/diskMemory/ProviderSegment.cpp
core/error/ArMemError.cpp core/error/ArMemError.cpp
client/ComponentPlugin.cpp client/ComponentPlugin.cpp
...@@ -120,7 +128,6 @@ set(LIB_HEADERS ...@@ -120,7 +128,6 @@ set(LIB_HEADERS
core/workingMemory/detail/MemoryContainer.h core/workingMemory/detail/MemoryContainer.h
core/workingMemory/detail/EntityContainer.h core/workingMemory/detail/EntityContainer.h
core/workingMemory/detail/TypedEntityContainer.h core/workingMemory/detail/TypedEntityContainer.h
core/workingMemory/ice_conversions.h core/workingMemory/ice_conversions.h
core/workingMemory/CoreSegment.h core/workingMemory/CoreSegment.h
core/workingMemory/Entity.h core/workingMemory/Entity.h
...@@ -129,10 +136,6 @@ set(LIB_HEADERS ...@@ -129,10 +136,6 @@ set(LIB_HEADERS
core/workingMemory/Memory.h core/workingMemory/Memory.h
core/workingMemory/ProviderSegment.h core/workingMemory/ProviderSegment.h
core/longtermMemory/detail/MemoryContainer.h
core/longtermMemory/detail/EntityContainer.h
core/longtermMemory/detail/TypedEntityContainer.h
core/longtermMemory/CoreSegment.h core/longtermMemory/CoreSegment.h
core/longtermMemory/Entity.h core/longtermMemory/Entity.h
core/longtermMemory/EntityInstance.h core/longtermMemory/EntityInstance.h
...@@ -141,6 +144,14 @@ set(LIB_HEADERS ...@@ -141,6 +144,14 @@ set(LIB_HEADERS
core/longtermMemory/ProviderSegment.h core/longtermMemory/ProviderSegment.h
core/longtermMemory/mongodb/MongoDBConnectionManager.h core/longtermMemory/mongodb/MongoDBConnectionManager.h
core/diskMemory/detail/TypedEntityContainer.h
core/diskMemory/CoreSegment.h
core/diskMemory/Entity.h
core/diskMemory/EntityInstance.h
core/diskMemory/EntitySnapshot.h
core/diskMemory/Memory.h
core/diskMemory/ProviderSegment.h
client.h client.h
client/ComponentPlugin.h client/ComponentPlugin.h
client/Reader.h client/Reader.h
...@@ -203,5 +214,6 @@ armarx_enable_aron_file_generation_for_target( ...@@ -203,5 +214,6 @@ armarx_enable_aron_file_generation_for_target(
add_library(RobotAPI::libraries::armem ALIAS "${LIB_NAME}") add_library(RobotAPI::libraries::armem ALIAS "${LIB_NAME}")
# add unit tests # add unit tests
add_subdirectory(test) add_subdirectory(test)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment