Fix compilation.

This commit is contained in:
James Grogan 2022-11-12 17:03:35 +00:00
parent d0ab51c99a
commit 8e0ce22b57
4 changed files with 10 additions and 6 deletions

View file

@ -23,5 +23,8 @@ list(APPEND geometry_LIB_INCLUDES
# add the library # add the library
add_library(geometry SHARED ${geometry_LIB_INCLUDES}) add_library(geometry SHARED ${geometry_LIB_INCLUDES})
target_include_directories(geometry PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}")
set_target_properties( geometry PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) set_target_properties( geometry PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
set_property(TARGET geometry PROPERTY FOLDER src) set_property(TARGET geometry PROPERTY FOLDER src)

View file

@ -11,6 +11,7 @@ list(APPEND mesh_LIB_INCLUDES
# add the library # add the library
add_library(mesh SHARED ${mesh_LIB_INCLUDES}) add_library(mesh SHARED ${mesh_LIB_INCLUDES})
target_link_libraries(mesh core geometry)
set_target_properties( mesh PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON ) set_target_properties( mesh PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )
set_property(TARGET mesh PROPERTY FOLDER src) set_property(TARGET mesh PROPERTY FOLDER src)

View file

@ -2,7 +2,7 @@
void TriMesh::populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces) void TriMesh::populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces)
{ {
mNodes = std::move(nodes); //mNodes = std::move(nodes);
mEdges = std::move(edges); //mEdges = std::move(edges);
mFaces = std::move(faces); //mFaces = std::move(faces);
} }

View file

@ -22,7 +22,7 @@ class TriMesh
void populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces); void populate(const VecNodes& nodes, const VecEdges& edges, const VecFaces& faces);
private: private:
std::vector<std::unique_ptr<Node> > mNodes; VecNodes mNodes;
std::vector<std::unique_ptr<Edge> > mEdges; VecEdges mEdges;
std::vector<std::unique_ptr<TriFace> > mFaces; VecFaces mFaces;
}; };