Commit dc5f62de authored by Sylvain Thery's avatar Sylvain Thery

bug compil

parent 4f7af6be
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
using namespace CGoGN; namespace CGoGN
{
// char instantiation // char instantiation
...@@ -59,7 +60,7 @@ template void AttributeContainer::setData<char>(unsigned int attrIndex, unsigned ...@@ -59,7 +60,7 @@ template void AttributeContainer::setData<char>(unsigned int attrIndex, unsigned
//template const Geom::Vec4f& AttributeContainer::getData<Geom::Vec4f>(unsigned int attrIndex, unsigned int eltIndex) const; //template const Geom::Vec4f& AttributeContainer::getData<Geom::Vec4f>(unsigned int attrIndex, unsigned int eltIndex) const;
//template void AttributeContainer::setData<Geom::Vec4f>(unsigned int attrIndex, unsigned int eltIndex, const Geom::Vec4f& data); //template void AttributeContainer::setData<Geom::Vec4f>(unsigned int attrIndex, unsigned int eltIndex, const Geom::Vec4f& data);
}
int test_attributeContainer() int test_attributeContainer()
{ {
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Container/fakeAttribute.h" #include "Container/fakeAttribute.h"
using namespace CGoGN;
namespace CGoGN
{
template class AttributeMultiVector<char>; template class AttributeMultiVector<char>;
template class AttributeMultiVector<unsigned char>; template class AttributeMultiVector<unsigned char>;
...@@ -15,6 +17,7 @@ template class AttributeMultiVector<double>; ...@@ -15,6 +17,7 @@ template class AttributeMultiVector<double>;
template class AttributeMultiVector<Geom::Vec3f>; template class AttributeMultiVector<Geom::Vec3f>;
template class AttributeMultiVector< NoTypeNameAttribute<std::vector<Geom::Vec2i>::const_iterator> >; template class AttributeMultiVector< NoTypeNameAttribute<std::vector<Geom::Vec2i>::const_iterator> >;
}
int test_attributeMultiVector() int test_attributeMultiVector()
{ {
......
...@@ -6,7 +6,9 @@ ...@@ -6,7 +6,9 @@
#include "Container/containerBrowser.h" #include "Container/containerBrowser.h"
using namespace CGoGN; namespace CGoGN
{
template class DartContainerBrowserSelector<EmbeddedMap2>; template class DartContainerBrowserSelector<EmbeddedMap2>;
template class DartContainerBrowserSelector<EmbeddedMap3>; template class DartContainerBrowserSelector<EmbeddedMap3>;
...@@ -26,6 +28,7 @@ template class ContainerBrowserCellMarked<EmbeddedMap3, EDGE>; ...@@ -26,6 +28,7 @@ template class ContainerBrowserCellMarked<EmbeddedMap3, EDGE>;
template class ContainerBrowserCellMarked<EmbeddedMap3, FACE>; template class ContainerBrowserCellMarked<EmbeddedMap3, FACE>;
template class ContainerBrowserCellMarked<EmbeddedMap3, VOLUME>; template class ContainerBrowserCellMarked<EmbeddedMap3, VOLUME>;
}
int test_containerBrowser() int test_containerBrowser()
{ {
......
...@@ -239,6 +239,12 @@ LIST(APPEND CGoGN_EXT_LIBS ...@@ -239,6 +239,12 @@ LIST(APPEND CGoGN_EXT_LIBS
${SUITESPARSE_LIBRARIES} ${SUITESPARSE_LIBRARIES}
) )
# added for debug linking ??
IF (APPLE)
FIND_LIBRARY(ACCELERATE_LIBRARY Accelerate)
LIST(APPEND CGoGN_EXT_LIBS ${ACCELERATE_LIBRARY})
ENDIF()
IF(NOT WIN32) IF(NOT WIN32)
LIST(APPEND CGoGN_EXT_LIBS pthread) #for c++11 thread LIST(APPEND CGoGN_EXT_LIBS pthread) #for c++11 thread
ENDIF() ENDIF()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment