diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 581c82f065403d781fbc91502d4db8b50a620419..99ca8f37e411521c62c024411ced0214692811ef 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -55,7 +55,7 @@ SET (CGoGN_EXT_LIBS #optionnal libs IF (WITH_ASSIMP) add_definitions(-DWITH_ASSIMP) - SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ThirdParty/Assimp/include) + SET (CGoGN_EXT_INCLUDES ${CGoGN_EXT_INCLUDES} ${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include) SET (CGoGN_EXT_LIBS ${CGoGN_EXT_LIBS} assimp) ENDIF (WITH_ASSIMP) diff --git a/include/Utils/img3D_IO.h b/include/Utils/img3D_IO.h index a68bbac81b9d7f1e03dce5f03f2b94664f26802a..45cf536d1e46054bb69c9c9ee9389a7aafaf551f 100644 --- a/include/Utils/img3D_IO.h +++ b/include/Utils/img3D_IO.h @@ -26,7 +26,6 @@ #define __IMG3D_IO__ #include "Utils/os_spec.h" -#include namespace CGoGN { diff --git a/include/Utils/pointSprite.h b/include/Utils/pointSprite.h index 150eb653348bdf023a92912403d70e98e5f4ad16..df19e4d2ae4cd2c033920671b1ab2c62f79e0606 100644 --- a/include/Utils/pointSprite.h +++ b/include/Utils/pointSprite.h @@ -27,8 +27,6 @@ #include "Utils/GLSLShader.h" #include "Geometry/vector_gen.h" -#include -#include namespace CGoGN { namespace Utils { class VBO; } } diff --git a/include/Utils/text3d.h b/include/Utils/text3d.h index 68267f097a390e8a53a0c52cb1f18ef1f8bdf47f..bd76625b931dfd19a81d362bb70ad3dc5e7526cf 100644 --- a/include/Utils/text3d.h +++ b/include/Utils/text3d.h @@ -27,8 +27,7 @@ #include "Utils/GLSLShader.h" #include "Geometry/vector_gen.h" -#include -#include + namespace CGoGN {