Commit 4bc17c66 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge branch 'master' of cgogn:~cgogn/CGoGN

parents 3429cb80 19fce084
...@@ -2,13 +2,14 @@ SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin) ...@@ -2,13 +2,14 @@ SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
SET (COMMON_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${DEVIL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} gzstream AntTweakBar openctm assimp) SET (COMMON_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${DEVIL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} gzstream AntTweakBar openctm assimp)
SET(CGoGN_LIBS_D topologyD algoD containerD utilsD) SET(CGoGN_LIBS_R topology algo container utils)
SET(CGoGN_LIBS_R topology algo container utils)
IF(WIN32) IF(WIN32)
SET(CGoGN_LIBS_D topology algo container utils) # libs have same name but in different place in Visual
add_subdirectory(Examples/Release) add_subdirectory(Examples/Release)
add_subdirectory(Tuto) add_subdirectory(Tuto)
ELSE(WIN32) ELSE(WIN32)
SET(CGoGN_LIBS_D topologyD algoD containerD utilsD)
add_subdirectory(Examples/Release) add_subdirectory(Examples/Release)
add_subdirectory(Examples/Debug) add_subdirectory(Examples/Debug)
add_subdirectory(Examples/Tests) add_subdirectory(Examples/Tests)
......
...@@ -28,9 +28,12 @@ include_directories( ...@@ -28,9 +28,12 @@ include_directories(
) )
# define libs path # define libs path
link_directories( IF(WIN32)
${CGoGN_ROOT_DIR}/lib/Release link_directories( ${CGoGN_ROOT_DIR}/lib/$(ConfigurationName) )
) ELSE(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF(WIN32)
#define exec to compile #define exec to compile
......
...@@ -2,12 +2,8 @@ cmake_minimum_required(VERSION 2.6) ...@@ -2,12 +2,8 @@ cmake_minimum_required(VERSION 2.6)
project(Tutos) project(Tutos)
#SET (COMMON_LIBS ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${GLEW_LIBRARY} ${DEVIL_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBXML2_LIBRARIES} gzstream AntTweakBar openctm)
SET (CMAKE_BUILD_TYPE Debug) SET (CMAKE_BUILD_TYPE Debug)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTOPOWARNING")
# FOR Qt4 # FOR Qt4
...@@ -18,6 +14,8 @@ ADD_DEFINITIONS(${QT_DEFINITIONS}) ...@@ -18,6 +14,8 @@ ADD_DEFINITIONS(${QT_DEFINITIONS})
# define includes path # define includes path
MESSAGE (STATUS ${BOOST_INCLUDE_PATH})
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
/usr/include/libxml2/ /usr/include/libxml2/
...@@ -26,11 +24,16 @@ include_directories( ...@@ -26,11 +24,16 @@ include_directories(
${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include ${CGoGN_ROOT_DIR}/ThirdParty/Assimp/include
${CGoGN_ROOT_DIR}/ThirdParty/glm ${CGoGN_ROOT_DIR}/ThirdParty/glm
${CGoGN_ROOT_DIR}/include ${CGoGN_ROOT_DIR}/include
${BOOST_INCLUDE_PATH}
) )
# define libs path # define libs path
link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug) IF(WIN32)
link_directories(${CGoGN_ROOT_DIR}/lib/$(ConfigurationName))
ELSE(WIN32)
link_directories(${CGoGN_ROOT_DIR}/lib/Release ${CGoGN_ROOT_DIR}/lib/Debug)
ENDIF(WIN32)
#define exec to compile #define exec to compile
...@@ -71,10 +74,16 @@ add_executable( tp_master tp_master.cpp ${tp_master_moc}) ...@@ -71,10 +74,16 @@ add_executable( tp_master tp_master.cpp ${tp_master_moc})
target_link_libraries( tp_master target_link_libraries( tp_master
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} ) ${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} )
#BOOST_LIBS macro: allow using compiled boost in windows (see readme)
# -first argument variable that will contain the libs
# -second argument list of boost libs separated by ; in " "
# exemple: BOOST_LIBS(boost_lib_lists "boost_thread-mt;boost_iostreams-mt")
BOOST_LIBS(boost_lib_lists "boost_thread-mt")
QT4_WRAP_CPP(tuto_mt_moc tuto_mt.h) QT4_WRAP_CPP(tuto_mt_moc tuto_mt.h)
add_executable( tuto_mt tuto_mt.cpp ${tuto_mt_moc}) add_executable( tuto_mt tuto_mt.cpp ${tuto_mt_moc})
target_link_libraries( tuto_mt target_link_libraries( tuto_mt
${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} boost_thread-mt) ${CGoGN_LIBS_D} ${COMMON_LIBS} ${QT_LIBRARIES} ${boost_lib_lists})
QT4_WRAP_CPP(tuto_ogl3_moc tuto_ogl3.h) QT4_WRAP_CPP(tuto_ogl3_moc tuto_ogl3.h)
add_executable( tuto_ogl3 tuto_ogl3.cpp ${tuto_ogl3_moc}) add_executable( tuto_ogl3 tuto_ogl3.cpp ${tuto_ogl3_moc})
......
...@@ -22,8 +22,6 @@ ...@@ -22,8 +22,6 @@
* * * *
*******************************************************************************/ *******************************************************************************/
//#define GL3_PROTOTYPES
#include "tuto1.h" #include "tuto1.h"
#include <iostream> #include <iostream>
...@@ -41,6 +39,9 @@ ...@@ -41,6 +39,9 @@
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include "Algo/Render/SVG/mapSVGRender.h"
using namespace CGoGN ; using namespace CGoGN ;
/** /**
...@@ -53,6 +54,11 @@ struct PFP: public PFP_STANDARD ...@@ -53,6 +54,11 @@ struct PFP: public PFP_STANDARD
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2<Map2> MAP;
}; };
// declaration of the map
PFP::MAP myMap;
// and attribute of position
AttributeHandler<PFP::VEC3> position;
void MyQT::cb_initGL() void MyQT::cb_initGL()
{ {
// choose to use GL version 2 // choose to use GL version 2
...@@ -99,12 +105,21 @@ void MyQT::cb_keyPress(int code) ...@@ -99,12 +105,21 @@ void MyQT::cb_keyPress(int code)
if ((code >'0') && (code<='9')) if ((code >'0') && (code<='9'))
CGoGNout << " key num " << code-'0' << "pressed"<< CGoGNendl; CGoGNout << " key num " << code-'0' << "pressed"<< CGoGNendl;
if (code == 's')
{
std::string filename = selectFileSave("Export SVG file ");
CGoGNout << "Exporting "<<filename<<CGoGNendl;
Algo::Render::SVG::SVGOut svg(filename,modelViewMatrix(),projectionMatrix());
svg.renderLinesToSVG<PFP>(myMap,position);
svg.setColor(Geom::Vec3f(0.7f,0.0f,0.4f));
svg.renderFacesToSVG<PFP>(myMap,position,0.8f);
//svg destruction close the file
}
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
// declaration of the map
PFP::MAP myMap;
// creation of 2 new faces: 1 triangle and 1 square // creation of 2 new faces: 1 triangle and 1 square
Dart d1 = myMap.newFace(3); Dart d1 = myMap.newFace(3);
...@@ -115,7 +130,7 @@ int main(int argc, char **argv) ...@@ -115,7 +130,7 @@ int main(int argc, char **argv)
// creation of a new attribute on vertices of type 3D vector // creation of a new attribute on vertices of type 3D vector
// a handler to this attribute is returned // a handler to this attribute is returned
AttributeHandler<PFP::VEC3> position = myMap.addAttribute<PFP::VEC3>(VERTEX_ORBIT, "position"); position = myMap.addAttribute<PFP::VEC3>(VERTEX_ORBIT, "position");
// affect a position to the vertices of the mesh // affect a position to the vertices of the mesh
position[d1] = PFP::VEC3(0, 0, 0); position[d1] = PFP::VEC3(0, 0, 0);
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include "Utils/shaderVectorPerVertex.h" #include "Utils/shaderVectorPerVertex.h"
#include "Utils/cgognStream.h" #include "Utils/cgognStream.h"
#include "Algo/Render/SVG/mapSVGRender.h"
using namespace CGoGN ; using namespace CGoGN ;
...@@ -68,24 +69,29 @@ void MyQT::balls_onoff(bool x) ...@@ -68,24 +69,29 @@ void MyQT::balls_onoff(bool x)
{ {
render_balls = !render_balls; render_balls = !render_balls;
updateGL(); updateGL();
CGoGNerr << " balls_onoff "<< CGoGNendl;
} }
void MyQT::vectors_onoff(bool x) void MyQT::vectors_onoff(bool x)
{ {
render_vectors = !render_vectors; render_vectors = !render_vectors;
updateGL(); updateGL();
CGoGNerr << " vectors_onoff "<< CGoGNflush;
} }
void MyQT::text_onoff(bool x) void MyQT::text_onoff(bool x)
{ {
render_text = !render_text; render_text = !render_text;
updateGL(); updateGL();
CGoGNerr << " text_onoff " << CGoGNflush;
} }
void MyQT::topo_onoff(bool x) void MyQT::topo_onoff(bool x)
{ {
render_topo = !render_topo; render_topo = !render_topo;
updateGL(); updateGL();
CGoGNerr << " topo_onoff " << CGoGNflush;
} }
void MyQT::slider_balls(int x) void MyQT::slider_balls(int x)
...@@ -106,6 +112,16 @@ void MyQT::slider_text(int x) ...@@ -106,6 +112,16 @@ void MyQT::slider_text(int x)
updateGL(); updateGL();
} }
void MyQT::animate()
{
// transfoMatrix() = glm::rotate(transfoMatrix(), 0.5f, glm::vec3(0.5773f,0.5773f,0.5773f));
transfoRotate( 0.5f, 0.5773f,0.5773f,0.5773f);
updateGLMatrices();
}
void MyQT::storeVerticesInfo() void MyQT::storeVerticesInfo()
{ {
...@@ -177,6 +193,11 @@ void MyQT::cb_initGL() ...@@ -177,6 +193,11 @@ void MyQT::cb_initGL()
m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS); m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS);
m_render_topo->updateData<PFP>(myMap, allDarts, position, 0.9, 0.9, 0.9); m_render_topo->updateData<PFP>(myMap, allDarts, position, 0.9, 0.9, 0.9);
// timer example for animation
m_timer = new QTimer( m_glWidget );
connect( m_timer, SIGNAL(timeout()), SLOT(animate()) );
} }
void MyQT::cb_redraw() void MyQT::cb_redraw()
...@@ -224,13 +245,9 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -224,13 +245,9 @@ void MyQT::cb_mousePress(int button, int x, int y)
{ {
if (Shift()) if (Shift())
{ {
Dart d = m_render_topo->picking<PFP>(myMap, allDarts, x, getHeight() - y); Dart d = m_render_topo->picking<PFP>(myMap, allDarts, x,y);
if (d != Dart::nil()) if (d != Dart::nil())
{ {
// std::stringstream ss;
// ss << "Dart "<< d << " clicked"<< CGoGNendl;
// statusMsg(ss.str().c_str());
CGoGNout << "Dart "<< d << " clicked" << CGoGNendl; CGoGNout << "Dart "<< d << " clicked" << CGoGNendl;
} }
else else
...@@ -240,6 +257,29 @@ void MyQT::cb_mousePress(int button, int x, int y) ...@@ -240,6 +257,29 @@ void MyQT::cb_mousePress(int button, int x, int y)
} }
} }
void MyQT::cb_keyPress(int code)
{
if (code == 's')
{
std::string filename = selectFileSave("Export SVG file ");
CGoGNout << "Exporting "<<filename<<CGoGNendl;
Algo::Render::SVG::SVGOut svg(filename,modelViewMatrix(),projectionMatrix());
// svg.renderLinesToSVG<PFP>(myMap,position);
svg.setColor(Geom::Vec3f(1.,0.,0.));
svg.renderFacesToSVG<PFP>(myMap,position,0.8f);
//svg destruction close the file
}
if (code == 't')
{
if (m_timer->isActive())
m_timer->stop();
else
m_timer->start(1000/30); // 30 fps
}
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
position = myMap.addAttribute<PFP::VEC3>(VERTEX_ORBIT, "position"); position = myMap.addAttribute<PFP::VEC3>(VERTEX_ORBIT, "position");
...@@ -305,7 +345,9 @@ int main(int argc, char **argv) ...@@ -305,7 +345,9 @@ int main(int argc, char **argv)
CGoGNdbg2.toConsole(&sqt); CGoGNdbg2.toConsole(&sqt);
CGoGNerr.toConsole(&sqt); CGoGNerr.toConsole(&sqt);
CGoGNdbg2 << " TextureSize " << texSize << CGoGNendl; CGoGNdbg2 << " TextureSize " << texSize << CGoGNendl;
CGoGNerr << " ERROR " << 5*7 << CGoGNendl; CGoGNerr << " test ERROR " << 5*7 << CGoGNflush;
// et on attend la fin. // et on attend la fin.
return app.exec(); return app.exec();
......
...@@ -72,6 +72,8 @@ class MyQT: public Utils::QT::SimpleQT ...@@ -72,6 +72,8 @@ class MyQT: public Utils::QT::SimpleQT
Utils::Strings3D* m_strings; Utils::Strings3D* m_strings;
Utils::PointSprite* m_sprite; Utils::PointSprite* m_sprite;
QTimer *m_timer;
public: public:
MyQT(): MyQT():
render_text(true), render_text(true),
...@@ -85,7 +87,8 @@ public: ...@@ -85,7 +87,8 @@ public:
m_shader(NULL), m_shader(NULL),
m_lines(NULL), m_lines(NULL),
m_strings(NULL), m_strings(NULL),
m_sprite(NULL) m_sprite(NULL),
m_timer(NULL)
{} {}
protected: protected:
...@@ -97,8 +100,7 @@ protected: ...@@ -97,8 +100,7 @@ protected:
void cb_mousePress(int button, int x, int y); void cb_mousePress(int button, int x, int y);
void cb_keyPress(int code) void cb_keyPress(int code);
{}
// slots locaux // slots locaux
public slots: public slots:
...@@ -110,6 +112,8 @@ public slots: ...@@ -110,6 +112,8 @@ public slots:
void slider_balls(int x); void slider_balls(int x);
void slider_vectors(int x); void slider_vectors(int x);
void slider_text(int x); void slider_text(int x);
void animate();
}; };
#endif #endif
...@@ -379,7 +379,7 @@ int main(int argc, char **argv) ...@@ -379,7 +379,7 @@ int main(int argc, char **argv)
{ {
using namespace CGoGN::Utils::QT; using namespace CGoGN::Utils::QT;
inputValues( VarInt(0,20,xx, "Entier", inputValues( VarInteger(0,20,xx, "Entier",
VarBool(zz, "Bool", VarBool(zz, "Bool",
VarDbl(0.314,3.14,yy,"Double", VarDbl(0.314,3.14,yy,"Double",
VarSlider(10,100,kk,"Slider", VarSlider(10,100,kk,"Slider",
......
...@@ -108,8 +108,6 @@ void MyQT::cb_initGL() ...@@ -108,8 +108,6 @@ void MyQT::cb_initGL()
shader1->setAttributePosition(positionVBO); shader1->setAttributePosition(positionVBO);
shader1->setAttributeNormal(normalVBO); shader1->setAttributeNormal(normalVBO);
registerShader(shader1);
currentShader = shader1; currentShader = shader1;
} }
......
Dépendences Linux: Dépendences Linux:
installer les paquets suivants: installer les paquets suivants:
cmake libXi-dev libXmu-dev freeglut3-dev libdevil-dev libglew-dev libgmp3-dev libxml2-dev libboost-dev lizip-dev libqt4-help qt4-designer qt4-dev-tools <<<<<<< HEAD
cmake libXi-dev libXmu-dev freeglut3-dev libdevil-dev libglew-dev libgmp3-dev libxml2-dev libboost-dev libzip-dev libqt4-help qt4-designer qt4-dev-tools
=======
cmake libXi-dev libXmu-dev freeglut3-dev libdevil-dev libglew-dev libgmp3-dev libxml2-dev libboost-dev lizip-dev libqt4-dev qt4-designer qt4-dev-tools
>>>>>>> 84fe346d20a65b08cb049bffc98c793c70f687f2
Pour compiler CGoGN: Pour compiler CGoGN:
......
...@@ -10,13 +10,18 @@ Cliquer sur Configure ...@@ -10,13 +10,18 @@ Cliquer sur Configure
Choisir le bon compilateur (celui de votre version de Visual C++) Choisir le bon compilateur (celui de votre version de Visual C++)
Recliquer sur Configure Recliquer sur Configure
Cliquer sur Generate Cliquer sur Generate
Unziper le dependencies.zip (http://iggservis.u-strasbg.fr/Data/dependencies.zip) dans le repertoire Visual Unziper le windows_dependencies.zip (http://iggservis.u-strasbg.fr/Data/) a la racine de CGoGN
Aller dans Visual et double-cliquer sur CGoGN.sln !! Aller dans Visual et double-cliquer sur CGoGN.sln !!
Pour que les executables fonctionnent ajouter ....\Visual\dependencies\dll dans la variable d'environnement path Pour que les executables fonctionnent ajouter le chemin vers les dll dans la variable d'environnement path
(ou copier les dll dans un répertoire déjà dans le path) (ou copier les dll dans un répertoire déjà dans le path)
Remarque: uniquement compilation 32bits testée pour le moment. Remarque pour l'utilisation de boost (manière simple):
-installer les binaires a l'aide de boostpro (www.boostpro.com)
-definir la varible d'env "boost_extension" avec ce que vous voulez utiliser (exemple: -vc100-mt-1_44)
-definir la varible d'env "boost_path" avec le chemin d'acces (exemple: C:\Program Files\boost\boost_1_44\)
-ajouter le chemin vers les dll dans le path (comme cf ci-dessus)
......
...@@ -8,6 +8,7 @@ SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..) ...@@ -8,6 +8,7 @@ SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
find_package(OpenGL) find_package(OpenGL)
find_package(GLUT) find_package(GLUT)
IF (APPLE) IF (APPLE)
SET(CMAKE_OSX_ARCHITECTURES x86_64) SET(CMAKE_OSX_ARCHITECTURES x86_64)
ENDIF(APPLE) ENDIF(APPLE)
...@@ -19,10 +20,10 @@ IF(WIN32) ...@@ -19,10 +20,10 @@ IF(WIN32)
add_subdirectory(gzstream/Build) add_subdirectory(gzstream/Build)
add_subdirectory(Numerical) add_subdirectory(Numerical)
add_subdirectory(Assimp/code) add_subdirectory(Assimp/code)
if(CMAKE_CONFIGURATION_TYPES) # if(CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES Release) # set(CMAKE_CONFIGURATION_TYPES Release)
set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Use only Release configuration for ThirdParty" FORCE) # set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Use only Release configuration for ThirdParty" FORCE)
endif() # endif()
ELSE(WIN32) ELSE(WIN32)
SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/Release) SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/Release)
add_custom_target( FakeTargetOpenCTM ALL "make" add_custom_target( FakeTargetOpenCTM ALL "make"
......
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
#include <stdio.h> #include <stdio.h>
#include <limits> #include <limits>
#include <cmath> #include <cmath>
#ifndef PI_DEFINED //#ifndef PI_DEFINED
#define PI_DEFINED //#define PI_DEFINED
const double M_PI = 3.14159265359; //double M_PI = 3.14159265359;
#endif //#endif
#endif #endif
......
...@@ -9,7 +9,8 @@ SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..) ...@@ -9,7 +9,8 @@ SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
SET(CMAKE_MODULE_PATH " ${CMAKE_MODULE_PATH} ${CGoGN_ROOT_DIR}/cmake_modules/") SET(CMAKE_MODULE_PATH " ${CMAKE_MODULE_PATH} ${CGoGN_ROOT_DIR}/cmake_modules/")
find_package(OpenGL) find_package(OpenGL REQUIRED)
find_package(Qt4 REQUIRED)
find_package(GLUT) find_package(GLUT)
# qq definition specifiques pour mac # qq definition specifiques pour mac
...@@ -26,9 +27,19 @@ IF(WIN32) ...@@ -26,9 +27,19 @@ IF(WIN32)
SET(DEVIL_LIBRARIES DevIL ILU ILUT) SET(DEVIL_LIBRARIES DevIL ILU ILUT)
SET(ZLIB_LIBRARIES zlib) SET(ZLIB_LIBRARIES zlib)
SET(LIBXML2_LIBRARIES xml2) SET(LIBXML2_LIBRARIES xml2)
MACRO(BOOST_LIBS lib_lists names)
SET (${lib_lists} "")
FOREACH(name ${names})
STRING(REGEX REPLACE "-mt" $ENV{boost_extension} newname ${name})
SET (${lib_lists} ${${lib_lists}} ${newname} )
ENDFOREACH(name)
ENDMACRO(BOOST_LIBS)
set (BOOST_INCLUDE_PATH $ENV{boost_path})
INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/) INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/)
LINK_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/lib/) LINK_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/lib/ $ENV{boost_path}/lib)
# add_subdirectory(${CGoGN_ROOT_DIR}/ThirdParty ThirdParty)
add_subdirectory(Release) add_subdirectory(Release)
add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps) add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
if (EXISTS "${CGoGN_ROOT_DIR}/Perso") if (EXISTS "${CGoGN_ROOT_DIR}/Perso")
...@@ -37,7 +48,7 @@ IF(WIN32) ...@@ -37,7 +48,7 @@ IF(WIN32)
if(CMAKE_CONFIGURATION_TYPES) if(CMAKE_CONFIGURATION_TYPES)
set(CMAKE_CONFIGURATION_TYPES Release Debug) set(CMAKE_CONFIGURATION_TYPES Release Debug)
set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Use only Release configuration for ThirdParty" FORCE) set(CMAKE_CONFIGURATION_TYPES "${CMAKE_CONFIGURATION_TYPES}" CACHE STRING "Only Release or Debug" FORCE)
endif() endif()
ELSE(WIN32) ELSE(WIN32)
...@@ -51,7 +62,14 @@ ELSE(WIN32) ...@@ -51,7 +62,14 @@ ELSE(WIN32)
ELSE(IL_LIBRARIES) ELSE(IL_LIBRARIES)
SET(DEVIL_LIBRARIES ${IL_LIBRARY} ${ILU_LIBRARY} ${ILUT_LIBRARY}) SET(DEVIL_LIBRARIES ${IL_LIBRARY} ${ILU_LIBRARY} ${ILUT_LIBRARY})
ENDIF(IL_LIBRARIES) ENDIF(IL_LIBRARIES)
# add_subdirectory(${CGoGN_ROOT_DIR}/ThirdParty ThirdParty)
MACRO(BOOST_LIBS lib_lists names)
SET (${lib_lists})
FOREACH(name ${names})
SET (${lib_lists} ${${lib_lists}} ${name} )
ENDFOREACH(name)
ENDMACRO(BOOST_LIBS)
add_subdirectory(Release) add_subdirectory(Release)
add_subdirectory(Debug) add_subdirectory(Debug)
add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps) add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
......