diff --git a/.hgignore b/.hgignore index 42e5b7c4a..267e97d49 100644 --- a/.hgignore +++ b/.hgignore @@ -18,6 +18,7 @@ external/tinyxml2/CMakeCache.txt external/embree/bin/* external/embree/doc/html/* external/embree/doc/latex/* +*.cmake .DS_Store libigl.zip *tags diff --git a/examples/ambient-occlusion-mex/mexFunction.cpp b/examples/ambient-occlusion-mex/mexFunction.cpp index 96e7bc1e4..89a4bd310 100644 --- a/examples/ambient-occlusion-mex/mexFunction.cpp +++ b/examples/ambient-occlusion-mex/mexFunction.cpp @@ -37,8 +37,8 @@ void mexFunction(int nlhs, mxArray *plhs[], //read("../shared/cheburashka.obj",V,F); //P = V; //per_vertex_normals(V,F,N); - EmbreeIntersector ei; - ei = EmbreeIntersector(V,F); + EmbreeIntersector<::MatrixXd::Scalar,::MatrixXi::Scalar> ei; + ei = EmbreeIntersector(V,F); ambient_occlusion(ei,P,N,num_samples,S); MatlabWorkspace mw; mw.save(V,"V"); diff --git a/examples/ambient-occlusion/Makefile b/examples/ambient-occlusion/Makefile index e81f4318c..ec30b955f 100644 --- a/examples/ambient-occlusion/Makefile +++ b/examples/ambient-occlusion/Makefile @@ -14,9 +14,12 @@ LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported +#EMBREE=$(LIBIGL)/external/embree +#EMBREE_INC=-I$(EMBREE)/rtcore -I$(EMBREE)/common +#EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys EMBREE=$(LIBIGL)/external/embree -EMBREE_INC=-I$(EMBREE)/rtcore -I$(EMBREE)/common -EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys +EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree +EMBREE_LIB=-L$(EMBREE)/bin -lembree -lsys ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit diff --git a/examples/ambient-occlusion/example.cpp b/examples/ambient-occlusion/example.cpp index b5dbda991..9bdcf1cd6 100644 --- a/examples/ambient-occlusion/example.cpp +++ b/examples/ambient-occlusion/example.cpp @@ -48,7 +48,7 @@ Eigen::MatrixXd V,N,C,mid; Eigen::MatrixXi F; // Bounding box diagonal length double bbd; -igl::EmbreeIntersector ei; +igl::EmbreeIntersector ei; // Running ambient occlusion Eigen::VectorXd S; int tot_num_samples = 0; @@ -373,7 +373,8 @@ int main(int argc, char * argv[]) bbd = (V.colwise().maxCoeff() - V.colwise().minCoeff()).maxCoeff(); // Init embree - ei = EmbreeIntersector(V,F); + cout<<"init embree..."<(V,F); // Init glut glutInit(&argc,argv); diff --git a/examples/embree/Makefile b/examples/embree/Makefile index e81f4318c..8725c0978 100644 --- a/examples/embree/Makefile +++ b/examples/embree/Makefile @@ -15,14 +15,16 @@ LIBIGL_LIB=-L$(LIBIGL)/lib -ligl -liglembree EIGEN3_INC=-I/opt/local/include/eigen3 -I/opt/local/include/eigen3/unsupported EMBREE=$(LIBIGL)/external/embree -EMBREE_INC=-I$(EMBREE)/rtcore -I$(EMBREE)/common -EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys +EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree +EMBREE_LIB=-L$(EMBREE)/bin -lembree -lsys ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit INC=$(LIBIGL_INC) $(ANTTWEAKBAR_INC) $(EIGEN3_INC) $(EMBREE_INC) LIB=$(OPENGL_LIB) $(GLUT_LIB) $(ANTTWEAKBAR_LIB) $(LIBIGL_LIB) $(EMBREE_LIB) +CFLAGS+=-g + example: example.o g++ $(OPENMP) $(AFLAGS) $(CFLAGS) -o example example.o $(LIB) diff --git a/examples/embree/example.cpp b/examples/embree/example.cpp index 6cd09712c..f9cef8df0 100644 --- a/examples/embree/example.cpp +++ b/examples/embree/example.cpp @@ -1,482 +1,483 @@ -#define IGL_HEADER_ONLY -#include -#include -#include -#include -#include -#include -#include -#include +//#define IGL_HEADER_ONLY +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include #include -#include -#include -#ifdef __APPLE__ -# include -#else -# include -#endif -#include - -#include +//#ifdef __APPLE__ +//# include +//#else +//# include +//#endif +//#include +// +//#include #include -// Width and height of window -int width,height; -// Rotation of scene -float scene_rot[4] = {0,0,0,1}; -// information at mouse down -float down_scene_rot[4] = {0,0,0,1}; -bool trackball_on = false; -int down_mouse_x,down_mouse_y; -// Position of light -float light_pos[4] = {0.1,0.1,-0.9,0}; -// Vertex positions, normals, colors and centroid -Eigen::MatrixXd V,N,C,mean; -// Bounding box diagonal length -double bbd; -// Faces -Eigen::MatrixXi F; +//// Width and height of window +//int width,height; +//// Rotation of scene +//float scene_rot[4] = {0,0,0,1}; +//// information at mouse down +//float down_scene_rot[4] = {0,0,0,1}; +//bool trackball_on = false; +//int down_mouse_x,down_mouse_y; +//// Position of light +//float light_pos[4] = {0.1,0.1,-0.9,0}; +//// Vertex positions, normals, colors and centroid +//Eigen::MatrixXd V,N,C,mean; +//// Bounding box diagonal length +//double bbd; +//// Faces +//Eigen::MatrixXi F; // Embree intersection structure igl::EmbreeIntersector ei; -// Hits collected -std::vector hits; -// Ray information, "projection screen" corners -Eigen::Vector3d win_s,s,d,dir,NW,NE,SE,SW; -// Textures and framebuffers for "projection screen" -GLuint tex_id = 0, fbo_id = 0, dfbo_id = 0; - -// Initialize textures and framebuffers. Must be called if window changes -// dimension -void init_texture() +//// Hits collected +//std::vector hits; +//// Ray information, "projection screen" corners +//Eigen::Vector3d win_s,s,d,dir,NW,NE,SE,SW; +//// Textures and framebuffers for "projection screen" +//GLuint tex_id = 0, fbo_id = 0, dfbo_id = 0; +// +//// Initialize textures and framebuffers. Must be called if window changes +//// dimension +//void init_texture() +//{ +// using namespace igl; +// using namespace std; +// // Set up a "render-to-texture" frame buffer and texture combo +// glDeleteTextures(1,&tex_id); +// glDeleteFramebuffersEXT(1,&fbo_id); +// glDeleteFramebuffersEXT(1,&dfbo_id); +// // http://www.opengl.org/wiki/Framebuffer_Object_Examples#Quick_example.2C_render_to_texture_.282D.29 +// glGenTextures(1, &tex_id); +// glBindTexture(GL_TEXTURE_2D, tex_id); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); +// glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); +// //NULL means reserve texture memory, but texels are undefined +// glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); +// glBindTexture(GL_TEXTURE_2D, 0); +// //------------------------- +// glGenFramebuffersEXT(1, &fbo_id); +// glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo_id); +// //Attach 2D texture to this FBO +// glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex_id, 0); +// glGenRenderbuffersEXT(1, &dfbo_id); +// glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, dfbo_id); +// glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, width, height); +// //------------------------- +// //Attach depth buffer to FBO +// glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, dfbo_id); +// //------------------------- +// //Does the GPU support current FBO configuration? +// GLenum status; +// status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); +// switch(status) +// { +// case GL_FRAMEBUFFER_COMPLETE_EXT: +// break; +// default: +// cout<<"error"<::iterator hit = hits.begin(); +// hit != hits.end(); +// hit++) +// { +// const double w0 = (1.0-hit->u-hit->v); +// const double w1 = hit->u; +// const double w2 = hit->v; +// VectorXd hitP = +// w0 * V.row(F(hit->id,0)) + +// w1 * V.row(F(hit->id,1)) + +// w2 * V.row(F(hit->id,2)); +// glVertex3dv(hitP.data()); +// } +// glEnd(); +// +// pop_object(); +// +// // Draw a nice floor +// glPushMatrix(); +// glEnable(GL_LIGHTING); +// glTranslated(0,-1,0); +// draw_floor(); +// glPopMatrix(); +// +// // draw a transparent "projection screen" show model at time of hit (aka +// // mouse down) +// push_object(); +// if(trackball_on) +// { +// glColor4f(0,0,0,1.0); +// glPointSize(10.0); +// glBegin(GL_POINTS); +// glVertex3dv(SW.data()); +// glVertex3dv(SE.data()); +// glVertex3dv(NE.data()); +// glVertex3dv(NW.data()); +// glEnd(); +// +// glDisable(GL_LIGHTING); +// glEnable(GL_TEXTURE_2D); +// glBindTexture(GL_TEXTURE_2D, tex_id); +// glColor4f(1,1,1,0.7); +// glBegin(GL_QUADS); +// glTexCoord2d(0,0); +// glVertex3dv(SW.data()); +// glTexCoord2d(1,0); +// glVertex3dv(SE.data()); +// glTexCoord2d(1,1); +// glVertex3dv(NE.data()); +// glTexCoord2d(0,1); +// glVertex3dv(NW.data()); +// glEnd(); +// glBindTexture(GL_TEXTURE_2D, 0); +// glDisable(GL_TEXTURE_2D); +// } +// pop_object(); +// pop_scene(); +// +// // Draw a faint point over mouse +// if(!trackball_on) +// { +// glDisable(GL_LIGHTING); +// glDisable(GL_COLOR_MATERIAL); +// glDisable(GL_DEPTH_TEST); +// glEnable(GL_BLEND); +// glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +// glColor4f(1.0,0.3,0.3,0.6); +// glMatrixMode(GL_PROJECTION); +// glLoadIdentity(); +// gluOrtho2D(0,width,0,height); +// glMatrixMode(GL_MODELVIEW); +// glLoadIdentity(); +// glPointSize(20.0); +// glBegin(GL_POINTS); +// glVertex2dv(win_s.data()); +// glEnd(); +// } +// report_gl_error(); +// +// glutSwapBuffers(); +// glutPostRedisplay(); +//} +// +//// Initialize colors to a boring green +//void init_C() +//{ +// C.col(0).setConstant(0.4); +// C.col(1).setConstant(0.8); +// C.col(2).setConstant(0.3); +//} +// +//void mouse_move(int mouse_x, int mouse_y) +//{ +// using namespace std; +// using namespace Eigen; +// using namespace igl; +// using namespace std; +// init_C(); +// glutSetCursor(GLUT_CURSOR_CROSSHAIR); +// // Push scene and object +// push_scene(); +// push_object(); +// // Unproject mouse at 0 depth and some positive depth +// win_s = Vector3d(mouse_x,height-mouse_y,0); +// Vector3d win_d(mouse_x,height-mouse_y,1); +// unproject(win_s,s); +// unproject(win_d,d); +// pop_object(); +// pop_scene(); +// report_gl_error(); +// // Shoot ray at unprojected mouse in view direction +// dir = d-s; +// int num_rays_shot; +// ei.intersectRay(s,dir,hits,num_rays_shot); +// for(vector::iterator hit = hits.begin(); +// hit != hits.end(); +// hit++) +// { +// // Change color of hit faces +// C(hit->id,0) = 1; +// C(hit->id,1) = 0.4; +// C(hit->id,2) = 0.4; +// } +//} +// +//void mouse(int glutButton, int glutState, int mouse_x, int mouse_y) +//{ +// using namespace std; +// using namespace Eigen; +// using namespace igl; +// switch(glutState) +// { +// case 1: +// // up +// glutSetCursor(GLUT_CURSOR_CROSSHAIR); +// trackball_on = false; +// hits.clear(); +// init_C(); +// break; +// case 0: +// // be sure this has been called recently +// mouse_move(mouse_x,mouse_y); +// // down +// glutSetCursor(GLUT_CURSOR_CYCLE); +// // collect information for trackball +// trackball_on = true; +// copy(scene_rot,scene_rot+4,down_scene_rot); +// down_mouse_x = mouse_x; +// down_mouse_y = mouse_y; +// // Collect "projection screen" locations +// push_scene(); +// push_object(); +// // unproject corners of window +// const double depth = 0.999; +// Vector3d win_NW( 0,height,depth); +// Vector3d win_NE(width,height,depth); +// Vector3d win_SE(width,0,depth); +// Vector3d win_SW(0,0,depth); +// unproject(win_NW,NW); +// unproject(win_NE,NE); +// unproject(win_SE,SE); +// unproject(win_SW,SW); +// // render to framebuffer +// glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo_id); +// glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, dfbo_id); +// glClearColor(0,0,0,1); +// glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); +// // Render the model ---> to the framebuffer attached to the "projection +// // screen" texture +// glEnable(GL_COLOR_MATERIAL); +// glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE); +// glEnable(GL_LIGHTING); +// glEnable(GL_DEPTH_TEST); +// draw_mesh(V,F,N,C); +// pop_object(); +// pop_scene(); +// glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); +// glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0); +// break; +// } +//} +// +//void mouse_drag(int mouse_x, int mouse_y) +//{ +// using namespace igl; +// +// if(trackball_on) +// { +// // Rotate according to trackball +// trackball( +// width, +// height, +// 2, +// down_scene_rot, +// down_mouse_x, +// down_mouse_y, +// mouse_x, +// mouse_y, +// scene_rot); +// } +//} +// +// +//void key(unsigned char key, int mouse_x, int mouse_y) +//{ +// using namespace std; +// switch(key) +// { +// // Ctrl-c and esc exit +// case char(3): +// case char(27): +// exit(0); +// default: +// cout<<"Unknown key command: "<::iterator hit = hits.begin(); - hit != hits.end(); - hit++) - { - const double w0 = (1.0-hit->u-hit->v); - const double w1 = hit->u; - const double w2 = hit->v; - VectorXd hitP = - w0 * V.row(F(hit->id,0)) + - w1 * V.row(F(hit->id,1)) + - w2 * V.row(F(hit->id,2)); - glVertex3dv(hitP.data()); - } - glEnd(); - - pop_object(); - - // Draw a nice floor - glPushMatrix(); - glEnable(GL_LIGHTING); - glTranslated(0,-1,0); - draw_floor(); - glPopMatrix(); - - // draw a transparent "projection screen" show model at time of hit (aka - // mouse down) - push_object(); - if(trackball_on) - { - glColor4f(0,0,0,1.0); - glPointSize(10.0); - glBegin(GL_POINTS); - glVertex3dv(SW.data()); - glVertex3dv(SE.data()); - glVertex3dv(NE.data()); - glVertex3dv(NW.data()); - glEnd(); - - glDisable(GL_LIGHTING); - glEnable(GL_TEXTURE_2D); - glBindTexture(GL_TEXTURE_2D, tex_id); - glColor4f(1,1,1,0.7); - glBegin(GL_QUADS); - glTexCoord2d(0,0); - glVertex3dv(SW.data()); - glTexCoord2d(1,0); - glVertex3dv(SE.data()); - glTexCoord2d(1,1); - glVertex3dv(NE.data()); - glTexCoord2d(0,1); - glVertex3dv(NW.data()); - glEnd(); - glBindTexture(GL_TEXTURE_2D, 0); - glDisable(GL_TEXTURE_2D); - } - pop_object(); - pop_scene(); - - // Draw a faint point over mouse - if(!trackball_on) - { - glDisable(GL_LIGHTING); - glDisable(GL_COLOR_MATERIAL); - glDisable(GL_DEPTH_TEST); - glEnable(GL_BLEND); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4f(1.0,0.3,0.3,0.6); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0,width,0,height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glPointSize(20.0); - glBegin(GL_POINTS); - glVertex2dv(win_s.data()); - glEnd(); - } - report_gl_error(); - - glutSwapBuffers(); - glutPostRedisplay(); -} - -// Initialize colors to a boring green -void init_C() -{ - C.col(0).setConstant(0.4); - C.col(1).setConstant(0.8); - C.col(2).setConstant(0.3); -} - -void mouse_move(int mouse_x, int mouse_y) -{ - using namespace std; - using namespace Eigen; - using namespace igl; - using namespace std; - init_C(); - glutSetCursor(GLUT_CURSOR_CROSSHAIR); - // Push scene and object - push_scene(); - push_object(); - // Unproject mouse at 0 depth and some positive depth - win_s = Vector3d(mouse_x,height-mouse_y,0); - Vector3d win_d(mouse_x,height-mouse_y,1); - unproject(win_s,s); - unproject(win_d,d); - pop_object(); - pop_scene(); - report_gl_error(); - // Shoot ray at unprojected mouse in view direction - dir = d-s; - int num_rays_shot; - ei.intersectRay(s,dir,hits,num_rays_shot); - for(vector::iterator hit = hits.begin(); - hit != hits.end(); - hit++) - { - // Change color of hit faces - C(hit->id,0) = 1; - C(hit->id,1) = 0.4; - C(hit->id,2) = 0.4; - } -} - -void mouse(int glutButton, int glutState, int mouse_x, int mouse_y) -{ - using namespace std; - using namespace Eigen; - using namespace igl; - switch(glutState) - { - case 1: - // up - glutSetCursor(GLUT_CURSOR_CROSSHAIR); - trackball_on = false; - hits.clear(); - init_C(); - break; - case 0: - // be sure this has been called recently - mouse_move(mouse_x,mouse_y); - // down - glutSetCursor(GLUT_CURSOR_CYCLE); - // collect information for trackball - trackball_on = true; - copy(scene_rot,scene_rot+4,down_scene_rot); - down_mouse_x = mouse_x; - down_mouse_y = mouse_y; - // Collect "projection screen" locations - push_scene(); - push_object(); - // unproject corners of window - const double depth = 0.999; - Vector3d win_NW( 0,height,depth); - Vector3d win_NE(width,height,depth); - Vector3d win_SE(width,0,depth); - Vector3d win_SW(0,0,depth); - unproject(win_NW,NW); - unproject(win_NE,NE); - unproject(win_SE,SE); - unproject(win_SW,SW); - // render to framebuffer - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo_id); - glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, dfbo_id); - glClearColor(0,0,0,1); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - // Render the model ---> to the framebuffer attached to the "projection - // screen" texture - glEnable(GL_COLOR_MATERIAL); - glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE); - glEnable(GL_LIGHTING); - glEnable(GL_DEPTH_TEST); - draw_mesh(V,F,N,C); - pop_object(); - pop_scene(); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0); - break; - } -} - -void mouse_drag(int mouse_x, int mouse_y) -{ - using namespace igl; - - if(trackball_on) - { - // Rotate according to trackball - trackball( - width, - height, - 2, - down_scene_rot, - down_mouse_x, - down_mouse_y, - mouse_x, - mouse_y, - scene_rot); - } -} - - -void key(unsigned char key, int mouse_x, int mouse_y) -{ - using namespace std; - switch(key) - { - // Ctrl-c and esc exit - case char(3): - case char(27): - exit(0); - default: - cout<<"Unknown key command: "<(V,F); - - // Init glut - glutInit(&argc,argv); - glutInitDisplayString( "rgba depth double samples>=8 "); - glutInitWindowSize(glutGet(GLUT_SCREEN_WIDTH)/2.0,glutGet(GLUT_SCREEN_HEIGHT)); - glutCreateWindow("embree"); - glutDisplayFunc(display); - glutReshapeFunc(reshape); - glutKeyboardFunc(key); - glutMouseFunc(mouse); - glutMotionFunc(mouse_drag); - glutPassiveMotionFunc(mouse_move); - glutMainLoop(); +// // init mesh +// string filename = "../shared/decimated-knight.obj"; +// if(argc < 2) +// { +// cerr<<"Usage:"<(V,F); +// +// // Init glut +// glutInit(&argc,argv); +// glutInitDisplayString( "rgba depth double samples>=8 "); +// glutInitWindowSize(glutGet(GLUT_SCREEN_WIDTH)/2.0,glutGet(GLUT_SCREEN_HEIGHT)); +// glutCreateWindow("embree"); +// glutDisplayFunc(display); +// glutReshapeFunc(reshape); +// glutKeyboardFunc(key); +// glutMouseFunc(mouse); +// glutMotionFunc(mouse_drag); +// glutPassiveMotionFunc(mouse_move); +// glutMainLoop(); return 0; } diff --git a/examples/patches/Makefile b/examples/patches/Makefile index 8453ee350..63c0715a7 100644 --- a/examples/patches/Makefile +++ b/examples/patches/Makefile @@ -20,8 +20,8 @@ ANTTWEAKBAR_INC=-I$(LIBIGL)/external/AntTweakBar/include ANTTWEAKBAR_LIB=-L$(LIBIGL)/external/AntTweakBar/lib -lAntTweakBar -framework AppKit EMBREE=$(LIBIGL)/external/embree -EMBREE_INC=-I$(EMBREE)/rtcore -I$(EMBREE)/common -EMBREE_LIB=-L$(EMBREE)/bin -lrtcore -lsys +EMBREE_INC=-I$(EMBREE)/ -I$(EMBREE)/embree +EMBREE_LIB=-L$(EMBREE)/bin -lembree -lsys MATLAB_INC=-I$(MATLAB)/extern/include/ MATLAB_LIB=-L$(MATLAB)/bin/maci64 -lmx -lmat -lmex -lstdc++ diff --git a/external/embree/bin/CMakeCache.txt b/external/embree/bin/CMakeCache.txt index 2dea3bc2b..d2a14c3a5 100644 --- a/external/embree/bin/CMakeCache.txt +++ b/external/embree/bin/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /usr/local/igl/libigl/external/embree2/bin +# For build in directory: /usr/local/igl/libigl/external/embree/bin # It was generated by CMake: /opt/local/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -285,13 +285,13 @@ device_network_LIB_DEPENDS:STATIC=general;sys;general;embree;general;image; device_singleray_LIB_DEPENDS:STATIC=general;sys;general;embree;general;image; //Value Computed by CMake -embree_BINARY_DIR:STATIC=/usr/local/igl/libigl/external/embree2/bin +embree_BINARY_DIR:STATIC=/usr/local/igl/libigl/external/embree/bin //Dependencies for the target embree_LIB_DEPENDS:STATIC=general;sys; //Value Computed by CMake -embree_SOURCE_DIR:STATIC=/usr/local/igl/libigl/external/embree2 +embree_SOURCE_DIR:STATIC=/usr/local/igl/libigl/external/embree //Dependencies for the target image_LIB_DEPENDS:STATIC=general;sys;general;/usr/local/lib/libHalf.dylib;general;/usr/local/lib/libIex.dylib;general;/usr/local/lib/libImath.dylib;general;/usr/local/lib/libIlmImf.dylib;general;/usr/local/lib/libIlmThread.dylib;general;/usr/local/lib/libMagick++.dylib;general;/usr/local/lib/libMagickCore.dylib; @@ -325,7 +325,7 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/local/bin/gmake //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/usr/local/igl/libigl/external/embree2/bin +CMAKE_CACHEFILE_DIR:INTERNAL=/usr/local/igl/libigl/external/embree/bin //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache @@ -390,7 +390,7 @@ CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 CMAKE_GENERATOR:INTERNAL=Unix Makefiles //Start directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/usr/local/igl/libigl/external/embree2 +CMAKE_HOME_DIRECTORY:INTERNAL=/usr/local/igl/libigl/external/embree //ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_INSTALL_PREFIX diff --git a/external/embree/bin/CMakeDefines.h b/external/embree/bin/CMakeDefines.h index 6e667180d..79b45c4ae 100644 --- a/external/embree/bin/CMakeDefines.h +++ b/external/embree/bin/CMakeDefines.h @@ -1 +1 @@ -#define CMAKE_BUILD_DIR "/usr/local/igl/libigl/external/embree2/bin" +#define CMAKE_BUILD_DIR "/usr/local/igl/libigl/external/embree/bin" diff --git a/external/embree/bin/Makefile b/external/embree/bin/Makefile index 99a9089ec..10d3f5e4e 100644 --- a/external/embree/bin/Makefile +++ b/external/embree/bin/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,9 +72,9 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/CMakeFiles/progress.marks + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target diff --git a/external/embree/bin/cmake_install.cmake b/external/embree/bin/cmake_install.cmake deleted file mode 100644 index 49c78677f..000000000 --- a/external/embree/bin/cmake_install.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2 - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/embree/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - -IF(CMAKE_INSTALL_COMPONENT) - SET(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt") -ELSE(CMAKE_INSTALL_COMPONENT) - SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") -ENDIF(CMAKE_INSTALL_COMPONENT) - -FILE(WRITE "/usr/local/igl/libigl/external/embree2/bin/${CMAKE_INSTALL_MANIFEST}" "") -FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) - FILE(APPEND "/usr/local/igl/libigl/external/embree2/bin/${CMAKE_INSTALL_MANIFEST}" "${file}\n") -ENDFOREACH(file) diff --git a/external/embree/bin/embree/Makefile b/external/embree/bin/embree/Makefile index 9c4f61c4e..8dfa79642 100644 --- a/external/embree/bin/embree/Makefile +++ b/external/embree/bin/embree/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/embree/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/embree/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. embree/CMakeFiles/embree.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/CMakeFiles/embree.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/CMakeFiles/embree.dir/rule .PHONY : embree/CMakeFiles/embree.dir/rule # Convenience name for target. @@ -112,517 +112,517 @@ embree: embree/CMakeFiles/embree.dir/rule # fast build rule for target. embree/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/build .PHONY : embree/fast # target to build an object file builders/heuristic_binning.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.o .PHONY : builders/heuristic_binning.o # target to preprocess a source file builders/heuristic_binning.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.i .PHONY : builders/heuristic_binning.i # target to generate assembly for a file builders/heuristic_binning.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_binning.s .PHONY : builders/heuristic_binning.s # target to build an object file builders/heuristic_spatial.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.o .PHONY : builders/heuristic_spatial.o # target to preprocess a source file builders/heuristic_spatial.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.i .PHONY : builders/heuristic_spatial.i # target to generate assembly for a file builders/heuristic_spatial.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/heuristic_spatial.s .PHONY : builders/heuristic_spatial.s # target to build an object file builders/primrefgen.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.o .PHONY : builders/primrefgen.o # target to preprocess a source file builders/primrefgen.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.i .PHONY : builders/primrefgen.i # target to generate assembly for a file builders/primrefgen.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/primrefgen.s .PHONY : builders/primrefgen.s # target to build an object file builders/splitter.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.o .PHONY : builders/splitter.o # target to preprocess a source file builders/splitter.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.i .PHONY : builders/splitter.i # target to generate assembly for a file builders/splitter.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter.s .PHONY : builders/splitter.s # target to build an object file builders/splitter_fallback.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.o .PHONY : builders/splitter_fallback.o # target to preprocess a source file builders/splitter_fallback.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.i .PHONY : builders/splitter_fallback.i # target to generate assembly for a file builders/splitter_fallback.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_fallback.s .PHONY : builders/splitter_fallback.s # target to build an object file builders/splitter_parallel.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.o .PHONY : builders/splitter_parallel.o # target to preprocess a source file builders/splitter_parallel.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.i .PHONY : builders/splitter_parallel.i # target to generate assembly for a file builders/splitter_parallel.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/builders/splitter_parallel.s .PHONY : builders/splitter_parallel.s # target to build an object file bvh2/bvh2.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.o .PHONY : bvh2/bvh2.o # target to preprocess a source file bvh2/bvh2.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.i .PHONY : bvh2/bvh2.i # target to generate assembly for a file bvh2/bvh2.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2.s .PHONY : bvh2/bvh2.s # target to build an object file bvh2/bvh2_intersector1.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.o .PHONY : bvh2/bvh2_intersector1.o # target to preprocess a source file bvh2/bvh2_intersector1.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.i .PHONY : bvh2/bvh2_intersector1.i # target to generate assembly for a file bvh2/bvh2_intersector1.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector1.s .PHONY : bvh2/bvh2_intersector1.s # target to build an object file bvh2/bvh2_intersector4.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.o .PHONY : bvh2/bvh2_intersector4.o # target to preprocess a source file bvh2/bvh2_intersector4.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.i .PHONY : bvh2/bvh2_intersector4.i # target to generate assembly for a file bvh2/bvh2_intersector4.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector4.s .PHONY : bvh2/bvh2_intersector4.s # target to build an object file bvh2/bvh2_intersector8.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.o .PHONY : bvh2/bvh2_intersector8.o # target to preprocess a source file bvh2/bvh2_intersector8.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.i .PHONY : bvh2/bvh2_intersector8.i # target to generate assembly for a file bvh2/bvh2_intersector8.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh2/bvh2_intersector8.s .PHONY : bvh2/bvh2_intersector8.s # target to build an object file bvh4/bvh4.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.o .PHONY : bvh4/bvh4.o # target to preprocess a source file bvh4/bvh4.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.i .PHONY : bvh4/bvh4.i # target to generate assembly for a file bvh4/bvh4.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4.s .PHONY : bvh4/bvh4.s # target to build an object file bvh4/bvh4_intersector1.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.o .PHONY : bvh4/bvh4_intersector1.o # target to preprocess a source file bvh4/bvh4_intersector1.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.i .PHONY : bvh4/bvh4_intersector1.i # target to generate assembly for a file bvh4/bvh4_intersector1.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector1.s .PHONY : bvh4/bvh4_intersector1.s # target to build an object file bvh4/bvh4_intersector4_chunk.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.o .PHONY : bvh4/bvh4_intersector4_chunk.o # target to preprocess a source file bvh4/bvh4_intersector4_chunk.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.i .PHONY : bvh4/bvh4_intersector4_chunk.i # target to generate assembly for a file bvh4/bvh4_intersector4_chunk.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_chunk.s .PHONY : bvh4/bvh4_intersector4_chunk.s # target to build an object file bvh4/bvh4_intersector4_hybrid.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.o .PHONY : bvh4/bvh4_intersector4_hybrid.o # target to preprocess a source file bvh4/bvh4_intersector4_hybrid.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.i .PHONY : bvh4/bvh4_intersector4_hybrid.i # target to generate assembly for a file bvh4/bvh4_intersector4_hybrid.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_hybrid.s .PHONY : bvh4/bvh4_intersector4_hybrid.s # target to build an object file bvh4/bvh4_intersector4_single.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.o .PHONY : bvh4/bvh4_intersector4_single.o # target to preprocess a source file bvh4/bvh4_intersector4_single.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.i .PHONY : bvh4/bvh4_intersector4_single.i # target to generate assembly for a file bvh4/bvh4_intersector4_single.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector4_single.s .PHONY : bvh4/bvh4_intersector4_single.s # target to build an object file bvh4/bvh4_intersector8_chunk.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.o .PHONY : bvh4/bvh4_intersector8_chunk.o # target to preprocess a source file bvh4/bvh4_intersector8_chunk.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.i .PHONY : bvh4/bvh4_intersector8_chunk.i # target to generate assembly for a file bvh4/bvh4_intersector8_chunk.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_chunk.s .PHONY : bvh4/bvh4_intersector8_chunk.s # target to build an object file bvh4/bvh4_intersector8_hybrid.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.o .PHONY : bvh4/bvh4_intersector8_hybrid.o # target to preprocess a source file bvh4/bvh4_intersector8_hybrid.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.i .PHONY : bvh4/bvh4_intersector8_hybrid.i # target to generate assembly for a file bvh4/bvh4_intersector8_hybrid.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_hybrid.s .PHONY : bvh4/bvh4_intersector8_hybrid.s # target to build an object file bvh4/bvh4_intersector8_single.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.o .PHONY : bvh4/bvh4_intersector8_single.o # target to preprocess a source file bvh4/bvh4_intersector8_single.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.i .PHONY : bvh4/bvh4_intersector8_single.i # target to generate assembly for a file bvh4/bvh4_intersector8_single.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4/bvh4_intersector8_single.s .PHONY : bvh4/bvh4_intersector8_single.s # target to build an object file bvh4i/bvh4i.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.o .PHONY : bvh4i/bvh4i.o # target to preprocess a source file bvh4i/bvh4i.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.i .PHONY : bvh4i/bvh4i.i # target to generate assembly for a file bvh4i/bvh4i.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i.s .PHONY : bvh4i/bvh4i.s # target to build an object file bvh4i/bvh4i_intersector1.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.o .PHONY : bvh4i/bvh4i_intersector1.o # target to preprocess a source file bvh4i/bvh4i_intersector1.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.i .PHONY : bvh4i/bvh4i_intersector1.i # target to generate assembly for a file bvh4i/bvh4i_intersector1.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4i/bvh4i_intersector1.s .PHONY : bvh4i/bvh4i_intersector1.s # target to build an object file bvh4mb/bvh4mb.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.o .PHONY : bvh4mb/bvh4mb.o # target to preprocess a source file bvh4mb/bvh4mb.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.i .PHONY : bvh4mb/bvh4mb.i # target to generate assembly for a file bvh4mb/bvh4mb.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb.s .PHONY : bvh4mb/bvh4mb.s # target to build an object file bvh4mb/bvh4mb_builder.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.o .PHONY : bvh4mb/bvh4mb_builder.o # target to preprocess a source file bvh4mb/bvh4mb_builder.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.i .PHONY : bvh4mb/bvh4mb_builder.i # target to generate assembly for a file bvh4mb/bvh4mb_builder.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_builder.s .PHONY : bvh4mb/bvh4mb_builder.s # target to build an object file bvh4mb/bvh4mb_intersector1.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.o .PHONY : bvh4mb/bvh4mb_intersector1.o # target to preprocess a source file bvh4mb/bvh4mb_intersector1.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.i .PHONY : bvh4mb/bvh4mb_intersector1.i # target to generate assembly for a file bvh4mb/bvh4mb_intersector1.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector1.s .PHONY : bvh4mb/bvh4mb_intersector1.s # target to build an object file bvh4mb/bvh4mb_intersector4.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.o .PHONY : bvh4mb/bvh4mb_intersector4.o # target to preprocess a source file bvh4mb/bvh4mb_intersector4.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.i .PHONY : bvh4mb/bvh4mb_intersector4.i # target to generate assembly for a file bvh4mb/bvh4mb_intersector4.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector4.s .PHONY : bvh4mb/bvh4mb_intersector4.s # target to build an object file bvh4mb/bvh4mb_intersector8.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.o .PHONY : bvh4mb/bvh4mb_intersector8.o # target to preprocess a source file bvh4mb/bvh4mb_intersector8.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.i .PHONY : bvh4mb/bvh4mb_intersector8.i # target to generate assembly for a file bvh4mb/bvh4mb_intersector8.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/bvh4mb/bvh4mb_intersector8.s .PHONY : bvh4mb/bvh4mb_intersector8.s # target to build an object file common/accel.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.o .PHONY : common/accel.o # target to preprocess a source file common/accel.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.i .PHONY : common/accel.i # target to generate assembly for a file common/accel.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/accel.s .PHONY : common/accel.s # target to build an object file common/alloc.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.o .PHONY : common/alloc.o # target to preprocess a source file common/alloc.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.i .PHONY : common/alloc.i # target to generate assembly for a file common/alloc.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/alloc.s .PHONY : common/alloc.s # target to build an object file common/registry_accel.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.o .PHONY : common/registry_accel.o # target to preprocess a source file common/registry_accel.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.i .PHONY : common/registry_accel.i # target to generate assembly for a file common/registry_accel.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_accel.s .PHONY : common/registry_accel.s # target to build an object file common/registry_builder.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.o .PHONY : common/registry_builder.o # target to preprocess a source file common/registry_builder.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.i .PHONY : common/registry_builder.i # target to generate assembly for a file common/registry_builder.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_builder.s .PHONY : common/registry_builder.s # target to build an object file common/registry_intersector.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.o .PHONY : common/registry_intersector.o # target to preprocess a source file common/registry_intersector.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.i .PHONY : common/registry_intersector.i # target to generate assembly for a file common/registry_intersector.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/registry_intersector.s .PHONY : common/registry_intersector.s # target to build an object file common/stat.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.o .PHONY : common/stat.o # target to preprocess a source file common/stat.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.i .PHONY : common/stat.i # target to generate assembly for a file common/stat.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/common/stat.s .PHONY : common/stat.s # target to build an object file embree.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.o .PHONY : embree.o # target to preprocess a source file embree.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.i .PHONY : embree.i # target to generate assembly for a file embree.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/embree.s .PHONY : embree.s # target to build an object file geometry/triangle_mesh.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.o .PHONY : geometry/triangle_mesh.o # target to preprocess a source file geometry/triangle_mesh.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.i .PHONY : geometry/triangle_mesh.i # target to generate assembly for a file geometry/triangle_mesh.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/triangle_mesh.s .PHONY : geometry/triangle_mesh.s # target to build an object file geometry/virtual_scene.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.o .PHONY : geometry/virtual_scene.o # target to preprocess a source file geometry/virtual_scene.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.i .PHONY : geometry/virtual_scene.i # target to generate assembly for a file geometry/virtual_scene.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/CMakeFiles/embree.dir/build.make embree/CMakeFiles/embree.dir/geometry/virtual_scene.s .PHONY : geometry/virtual_scene.s # Help Target @@ -747,6 +747,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/embree/cmake_install.cmake b/external/embree/bin/embree/cmake_install.cmake deleted file mode 100644 index 0e5b8d480..000000000 --- a/external/embree/bin/embree/cmake_install.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/embree - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/embree/sys/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/embree/simd/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - diff --git a/external/embree/bin/embree/simd/Makefile b/external/embree/bin/embree/simd/Makefile index 54a267baa..f616a0d9f 100644 --- a/external/embree/bin/embree/simd/Makefile +++ b/external/embree/bin/embree/simd/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/embree/simd/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/embree/simd/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/clean .PHONY : clean # The main clean target @@ -88,17 +88,17 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/simd/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Help Target @@ -120,6 +120,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/embree/simd/cmake_install.cmake b/external/embree/bin/embree/simd/cmake_install.cmake deleted file mode 100644 index f71ff4959..000000000 --- a/external/embree/bin/embree/simd/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/embree/simd - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/embree/sys/Makefile b/external/embree/bin/embree/sys/Makefile index f2a140868..cd97e5632 100644 --- a/external/embree/bin/embree/sys/Makefile +++ b/external/embree/bin/embree/sys/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/embree/sys/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/embree/sys/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. embree/sys/CMakeFiles/sys.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/CMakeFiles/sys.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 embree/sys/CMakeFiles/sys.dir/rule .PHONY : embree/sys/CMakeFiles/sys.dir/rule # Convenience name for target. @@ -112,187 +112,187 @@ sys: embree/sys/CMakeFiles/sys.dir/rule # fast build rule for target. sys/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/build .PHONY : sys/fast # target to build an object file filename.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.o .PHONY : filename.o # target to preprocess a source file filename.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.i .PHONY : filename.i # target to generate assembly for a file filename.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/filename.s .PHONY : filename.s # target to build an object file library.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.o .PHONY : library.o # target to preprocess a source file library.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.i .PHONY : library.i # target to generate assembly for a file library.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/library.s .PHONY : library.s # target to build an object file network.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.o .PHONY : network.o # target to preprocess a source file network.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.i .PHONY : network.i # target to generate assembly for a file network.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/network.s .PHONY : network.s # target to build an object file platform.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.o .PHONY : platform.o # target to preprocess a source file platform.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.i .PHONY : platform.i # target to generate assembly for a file platform.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/platform.s .PHONY : platform.s # target to build an object file stl/string.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.o .PHONY : stl/string.o # target to preprocess a source file stl/string.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.i .PHONY : stl/string.i # target to generate assembly for a file stl/string.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/stl/string.s .PHONY : stl/string.s # target to build an object file sync/condition.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.o .PHONY : sync/condition.o # target to preprocess a source file sync/condition.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.i .PHONY : sync/condition.i # target to generate assembly for a file sync/condition.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/condition.s .PHONY : sync/condition.s # target to build an object file sync/mutex.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.o .PHONY : sync/mutex.o # target to preprocess a source file sync/mutex.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.i .PHONY : sync/mutex.i # target to generate assembly for a file sync/mutex.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sync/mutex.s .PHONY : sync/mutex.s # target to build an object file sysinfo.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.o .PHONY : sysinfo.o # target to preprocess a source file sysinfo.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.i .PHONY : sysinfo.i # target to generate assembly for a file sysinfo.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/sysinfo.s .PHONY : sysinfo.s # target to build an object file taskscheduler.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.o .PHONY : taskscheduler.o # target to preprocess a source file taskscheduler.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.i .PHONY : taskscheduler.i # target to generate assembly for a file taskscheduler.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler.s .PHONY : taskscheduler.s # target to build an object file taskscheduler_mic.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.o .PHONY : taskscheduler_mic.o # target to preprocess a source file taskscheduler_mic.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.i .PHONY : taskscheduler_mic.i # target to generate assembly for a file taskscheduler_mic.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_mic.s .PHONY : taskscheduler_mic.s # target to build an object file taskscheduler_sys.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.o .PHONY : taskscheduler_sys.o # target to preprocess a source file taskscheduler_sys.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.i .PHONY : taskscheduler_sys.i # target to generate assembly for a file taskscheduler_sys.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/taskscheduler_sys.s .PHONY : taskscheduler_sys.s # target to build an object file thread.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.o .PHONY : thread.o # target to preprocess a source file thread.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.i .PHONY : thread.i # target to generate assembly for a file thread.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f embree/sys/CMakeFiles/sys.dir/build.make embree/sys/CMakeFiles/sys.dir/thread.s .PHONY : thread.s # Help Target @@ -351,6 +351,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/embree/sys/cmake_install.cmake b/external/embree/bin/embree/sys/cmake_install.cmake deleted file mode 100644 index 9bec2943a..000000000 --- a/external/embree/bin/embree/sys/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/embree/sys - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/Makefile b/external/embree/bin/examples/Makefile index 7286cf62d..de1978a7b 100644 --- a/external/embree/bin/examples/Makefile +++ b/external/embree/bin/examples/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/clean .PHONY : clean # The main clean target @@ -88,17 +88,17 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Help Target @@ -120,6 +120,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/cmake_install.cmake b/external/embree/bin/examples/cmake_install.cmake deleted file mode 100644 index 28a8af914..000000000 --- a/external/embree/bin/examples/cmake_install.cmake +++ /dev/null @@ -1,37 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/common/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/tutorials/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - diff --git a/external/embree/bin/examples/common/Makefile b/external/embree/bin/examples/common/Makefile index e0619fe0f..8dc55df63 100644 --- a/external/embree/bin/examples/common/Makefile +++ b/external/embree/bin/examples/common/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/common/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/common/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/clean .PHONY : clean # The main clean target @@ -88,17 +88,17 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Help Target @@ -120,6 +120,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/common/cmake_install.cmake b/external/embree/bin/examples/common/cmake_install.cmake deleted file mode 100644 index cd6fe9c79..000000000 --- a/external/embree/bin/examples/common/cmake_install.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/common - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/common/image/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/common/lexers/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - diff --git a/external/embree/bin/examples/common/image/Makefile b/external/embree/bin/examples/common/image/Makefile index 1051e8d2a..0d0e224c8 100644 --- a/external/embree/bin/examples/common/image/Makefile +++ b/external/embree/bin/examples/common/image/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/common/image/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/common/image/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/common/image/CMakeFiles/image.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/CMakeFiles/image.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/image/CMakeFiles/image.dir/rule .PHONY : examples/common/image/CMakeFiles/image.dir/rule # Convenience name for target. @@ -112,97 +112,97 @@ image: examples/common/image/CMakeFiles/image.dir/rule # fast build rule for target. image/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/build .PHONY : image/fast # target to build an object file exr.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.o .PHONY : exr.o # target to preprocess a source file exr.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.i .PHONY : exr.i # target to generate assembly for a file exr.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/exr.s .PHONY : exr.s # target to build an object file image.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.o .PHONY : image.o # target to preprocess a source file image.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.i .PHONY : image.i # target to generate assembly for a file image.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/image.s .PHONY : image.s # target to build an object file magick.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.o .PHONY : magick.o # target to preprocess a source file magick.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.i .PHONY : magick.i # target to generate assembly for a file magick.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/magick.s .PHONY : magick.s # target to build an object file pfm.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.o .PHONY : pfm.o # target to preprocess a source file pfm.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.i .PHONY : pfm.i # target to generate assembly for a file pfm.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/pfm.s .PHONY : pfm.s # target to build an object file ppm.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.o .PHONY : ppm.o # target to preprocess a source file ppm.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.i .PHONY : ppm.i # target to generate assembly for a file ppm.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/ppm.s .PHONY : ppm.s # target to build an object file tga.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.o .PHONY : tga.o # target to preprocess a source file tga.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.i .PHONY : tga.i # target to generate assembly for a file tga.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/image/CMakeFiles/image.dir/build.make examples/common/image/CMakeFiles/image.dir/tga.s .PHONY : tga.s # Help Target @@ -243,6 +243,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/common/image/cmake_install.cmake b/external/embree/bin/examples/common/image/cmake_install.cmake deleted file mode 100644 index 03bedb63b..000000000 --- a/external/embree/bin/examples/common/image/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/common/image - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/common/lexers/Makefile b/external/embree/bin/examples/common/lexers/Makefile index c45973685..236077d16 100644 --- a/external/embree/bin/examples/common/lexers/Makefile +++ b/external/embree/bin/examples/common/lexers/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/common/lexers/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/common/lexers/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/common/lexers/CMakeFiles/lexers.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/CMakeFiles/lexers.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/common/lexers/CMakeFiles/lexers.dir/rule .PHONY : examples/common/lexers/CMakeFiles/lexers.dir/rule # Convenience name for target. @@ -112,37 +112,37 @@ lexers: examples/common/lexers/CMakeFiles/lexers.dir/rule # fast build rule for target. lexers/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/build .PHONY : lexers/fast # target to build an object file stringstream.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.o .PHONY : stringstream.o # target to preprocess a source file stringstream.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.i .PHONY : stringstream.i # target to generate assembly for a file stringstream.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/stringstream.s .PHONY : stringstream.s # target to build an object file tokenstream.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.o .PHONY : tokenstream.o # target to preprocess a source file tokenstream.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.i .PHONY : tokenstream.i # target to generate assembly for a file tokenstream.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/common/lexers/CMakeFiles/lexers.dir/build.make examples/common/lexers/CMakeFiles/lexers.dir/tokenstream.s .PHONY : tokenstream.s # Help Target @@ -171,6 +171,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/common/lexers/cmake_install.cmake b/external/embree/bin/examples/common/lexers/cmake_install.cmake deleted file mode 100644 index e752224e6..000000000 --- a/external/embree/bin/examples/common/lexers/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/common/lexers - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/renderer/Makefile b/external/embree/bin/examples/renderer/Makefile index d9c167617..c1a61db44 100644 --- a/external/embree/bin/examples/renderer/Makefile +++ b/external/embree/bin/examples/renderer/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/clean .PHONY : clean # The main clean target @@ -88,17 +88,17 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Help Target @@ -120,6 +120,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/cmake_install.cmake b/external/embree/bin/examples/renderer/cmake_install.cmake deleted file mode 100644 index f91170408..000000000 --- a/external/embree/bin/examples/renderer/cmake_install.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/renderer/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/device/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/device_network/cmake_install.cmake") - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/device_singleray/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - diff --git a/external/embree/bin/examples/renderer/device/Makefile b/external/embree/bin/examples/renderer/device/Makefile index 6b13fa898..b360aa38b 100644 --- a/external/embree/bin/examples/renderer/device/Makefile +++ b/external/embree/bin/examples/renderer/device/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/device/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/device/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/renderer/device/CMakeFiles/device.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/CMakeFiles/device.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/CMakeFiles/device.dir/rule .PHONY : examples/renderer/device/CMakeFiles/device.dir/rule # Convenience name for target. @@ -112,37 +112,37 @@ device: examples/renderer/device/CMakeFiles/device.dir/rule # fast build rule for target. device/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/build .PHONY : device/fast # target to build an object file device.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.o .PHONY : device.o # target to preprocess a source file device.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.i .PHONY : device.i # target to generate assembly for a file device.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/device.s .PHONY : device.s # target to build an object file handle.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.o .PHONY : handle.o # target to preprocess a source file handle.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.i .PHONY : handle.i # target to generate assembly for a file handle.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/CMakeFiles/device.dir/build.make examples/renderer/device/CMakeFiles/device.dir/handle.s .PHONY : handle.s # Help Target @@ -171,6 +171,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/device/cmake_install.cmake b/external/embree/bin/examples/renderer/device/cmake_install.cmake deleted file mode 100644 index 9eddf73c4..000000000 --- a/external/embree/bin/examples/renderer/device/cmake_install.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer/device - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - -IF(NOT CMAKE_INSTALL_LOCAL_ONLY) - # Include the install script for each subdirectory. - INCLUDE("/usr/local/igl/libigl/external/embree2/bin/examples/renderer/device/loaders/cmake_install.cmake") - -ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY) - diff --git a/external/embree/bin/examples/renderer/device/loaders/Makefile b/external/embree/bin/examples/renderer/device/loaders/Makefile index 8783b8277..4c3bf11e3 100644 --- a/external/embree/bin/examples/renderer/device/loaders/Makefile +++ b/external/embree/bin/examples/renderer/device/loaders/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/device/loaders/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/device/loaders/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/renderer/device/loaders/CMakeFiles/loaders.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/CMakeFiles/loaders.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device/loaders/CMakeFiles/loaders.dir/rule .PHONY : examples/renderer/device/loaders/CMakeFiles/loaders.dir/rule # Convenience name for target. @@ -112,67 +112,67 @@ loaders: examples/renderer/device/loaders/CMakeFiles/loaders.dir/rule # fast build rule for target. loaders/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/build .PHONY : loaders/fast # target to build an object file loaders.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.o .PHONY : loaders.o # target to preprocess a source file loaders.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.i .PHONY : loaders.i # target to generate assembly for a file loaders.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/loaders.s .PHONY : loaders.s # target to build an object file obj_loader.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.o .PHONY : obj_loader.o # target to preprocess a source file obj_loader.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.i .PHONY : obj_loader.i # target to generate assembly for a file obj_loader.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/obj_loader.s .PHONY : obj_loader.s # target to build an object file xml_loader.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.o .PHONY : xml_loader.o # target to preprocess a source file xml_loader.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.i .PHONY : xml_loader.i # target to generate assembly for a file xml_loader.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_loader.s .PHONY : xml_loader.s # target to build an object file xml_parser.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.o .PHONY : xml_parser.o # target to preprocess a source file xml_parser.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.i .PHONY : xml_parser.i # target to generate assembly for a file xml_parser.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device/loaders/CMakeFiles/loaders.dir/build.make examples/renderer/device/loaders/CMakeFiles/loaders.dir/xml_parser.s .PHONY : xml_parser.s # Help Target @@ -207,6 +207,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/device/loaders/cmake_install.cmake b/external/embree/bin/examples/renderer/device/loaders/cmake_install.cmake deleted file mode 100644 index c77aad5c8..000000000 --- a/external/embree/bin/examples/renderer/device/loaders/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer/device/loaders - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/renderer/device_network/Makefile b/external/embree/bin/examples/renderer/device_network/Makefile index 94f7e81c3..65eba0788 100644 --- a/external/embree/bin/examples/renderer/device_network/Makefile +++ b/external/embree/bin/examples/renderer/device_network/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/device_network/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/device_network/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/renderer/device_network/CMakeFiles/device_network.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/CMakeFiles/device_network.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/CMakeFiles/device_network.dir/rule .PHONY : examples/renderer/device_network/CMakeFiles/device_network.dir/rule # Convenience name for target. @@ -112,12 +112,12 @@ device_network: examples/renderer/device_network/CMakeFiles/device_network.dir/r # fast build rule for target. device_network/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/build .PHONY : device_network/fast # Convenience name for target. examples/renderer/device_network/CMakeFiles/renderer_server.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/CMakeFiles/renderer_server.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_network/CMakeFiles/renderer_server.dir/rule .PHONY : examples/renderer/device_network/CMakeFiles/renderer_server.dir/rule # Convenience name for target. @@ -126,52 +126,52 @@ renderer_server: examples/renderer/device_network/CMakeFiles/renderer_server.dir # fast build rule for target. renderer_server/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/build .PHONY : renderer_server/fast # target to build an object file network_device.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.o .PHONY : network_device.o # target to preprocess a source file network_device.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.i .PHONY : network_device.i # target to generate assembly for a file network_device.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/device_network.dir/build.make examples/renderer/device_network/CMakeFiles/device_network.dir/network_device.s .PHONY : network_device.s # target to build an object file network_server.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.o .PHONY : network_server.o # target to preprocess a source file network_server.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.i .PHONY : network_server.i # target to generate assembly for a file network_server.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server.s .PHONY : network_server.s # target to build an object file network_server_main.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.o .PHONY : network_server_main.o # target to preprocess a source file network_server_main.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.i .PHONY : network_server_main.i # target to generate assembly for a file network_server_main.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_network/CMakeFiles/renderer_server.dir/build.make examples/renderer/device_network/CMakeFiles/renderer_server.dir/network_server_main.s .PHONY : network_server_main.s # Help Target @@ -204,6 +204,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/device_network/cmake_install.cmake b/external/embree/bin/examples/renderer/device_network/cmake_install.cmake deleted file mode 100644 index 0f40d7949..000000000 --- a/external/embree/bin/examples/renderer/device_network/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer/device_network - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/renderer/device_singleray/Makefile b/external/embree/bin/examples/renderer/device_singleray/Makefile index f5458fdb0..626402d0f 100644 --- a/external/embree/bin/examples/renderer/device_singleray/Makefile +++ b/external/embree/bin/examples/renderer/device_singleray/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/device_singleray/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/device_singleray/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/rule .PHONY : examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/rule # Convenience name for target. @@ -112,187 +112,187 @@ device_singleray: examples/renderer/device_singleray/CMakeFiles/device_singleray # fast build rule for target. device_singleray/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build .PHONY : device_singleray/fast # target to build an object file api/singleray_device.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.o .PHONY : api/singleray_device.o # target to preprocess a source file api/singleray_device.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.i .PHONY : api/singleray_device.i # target to generate assembly for a file api/singleray_device.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/api/singleray_device.s .PHONY : api/singleray_device.s # target to build an object file filters/filter.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.o .PHONY : filters/filter.o # target to preprocess a source file filters/filter.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.i .PHONY : filters/filter.i # target to generate assembly for a file filters/filter.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/filters/filter.s .PHONY : filters/filter.s # target to build an object file integrators/pathtraceintegrator.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.o .PHONY : integrators/pathtraceintegrator.o # target to preprocess a source file integrators/pathtraceintegrator.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.i .PHONY : integrators/pathtraceintegrator.i # target to generate assembly for a file integrators/pathtraceintegrator.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/integrators/pathtraceintegrator.s .PHONY : integrators/pathtraceintegrator.s # target to build an object file lights/hdrilight.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.o .PHONY : lights/hdrilight.o # target to preprocess a source file lights/hdrilight.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.i .PHONY : lights/hdrilight.i # target to generate assembly for a file lights/hdrilight.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/lights/hdrilight.s .PHONY : lights/hdrilight.s # target to build an object file renderers/debugrenderer.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.o .PHONY : renderers/debugrenderer.o # target to preprocess a source file renderers/debugrenderer.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.i .PHONY : renderers/debugrenderer.i # target to generate assembly for a file renderers/debugrenderer.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/debugrenderer.s .PHONY : renderers/debugrenderer.s # target to build an object file renderers/integratorrenderer.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.o .PHONY : renderers/integratorrenderer.o # target to preprocess a source file renderers/integratorrenderer.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.i .PHONY : renderers/integratorrenderer.i # target to generate assembly for a file renderers/integratorrenderer.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/integratorrenderer.s .PHONY : renderers/integratorrenderer.s # target to build an object file renderers/progress.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.o .PHONY : renderers/progress.o # target to preprocess a source file renderers/progress.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.i .PHONY : renderers/progress.i # target to generate assembly for a file renderers/progress.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/renderers/progress.s .PHONY : renderers/progress.s # target to build an object file samplers/distribution1d.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.o .PHONY : samplers/distribution1d.o # target to preprocess a source file samplers/distribution1d.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.i .PHONY : samplers/distribution1d.i # target to generate assembly for a file samplers/distribution1d.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution1d.s .PHONY : samplers/distribution1d.s # target to build an object file samplers/distribution2d.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.o .PHONY : samplers/distribution2d.o # target to preprocess a source file samplers/distribution2d.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.i .PHONY : samplers/distribution2d.i # target to generate assembly for a file samplers/distribution2d.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/distribution2d.s .PHONY : samplers/distribution2d.s # target to build an object file samplers/sampler.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.o .PHONY : samplers/sampler.o # target to preprocess a source file samplers/sampler.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.i .PHONY : samplers/sampler.i # target to generate assembly for a file samplers/sampler.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/samplers/sampler.s .PHONY : samplers/sampler.s # target to build an object file shapes/trianglemesh_full.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.o .PHONY : shapes/trianglemesh_full.o # target to preprocess a source file shapes/trianglemesh_full.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.i .PHONY : shapes/trianglemesh_full.i # target to generate assembly for a file shapes/trianglemesh_full.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_full.s .PHONY : shapes/trianglemesh_full.s # target to build an object file shapes/trianglemesh_normals.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.o .PHONY : shapes/trianglemesh_normals.o # target to preprocess a source file shapes/trianglemesh_normals.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.i .PHONY : shapes/trianglemesh_normals.i # target to generate assembly for a file shapes/trianglemesh_normals.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/build.make examples/renderer/device_singleray/CMakeFiles/device_singleray.dir/shapes/trianglemesh_normals.s .PHONY : shapes/trianglemesh_normals.s # Help Target @@ -351,6 +351,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/device_singleray/cmake_install.cmake b/external/embree/bin/examples/renderer/device_singleray/cmake_install.cmake deleted file mode 100644 index 4a10c679c..000000000 --- a/external/embree/bin/examples/renderer/device_singleray/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer/device_singleray - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/renderer/renderer/Makefile b/external/embree/bin/examples/renderer/renderer/Makefile index 06cebaace..09e783d56 100644 --- a/external/embree/bin/examples/renderer/renderer/Makefile +++ b/external/embree/bin/examples/renderer/renderer/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/renderer/renderer/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/renderer/renderer/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/renderer/renderer/CMakeFiles/renderer.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/CMakeFiles/renderer.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/renderer/renderer/CMakeFiles/renderer.dir/rule .PHONY : examples/renderer/renderer/CMakeFiles/renderer.dir/rule # Convenience name for target. @@ -112,52 +112,52 @@ renderer: examples/renderer/renderer/CMakeFiles/renderer.dir/rule # fast build rule for target. renderer/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/build .PHONY : renderer/fast # target to build an object file glutdisplay.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.o .PHONY : glutdisplay.o # target to preprocess a source file glutdisplay.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.i .PHONY : glutdisplay.i # target to generate assembly for a file glutdisplay.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/glutdisplay.s .PHONY : glutdisplay.s # target to build an object file regression.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.o .PHONY : regression.o # target to preprocess a source file regression.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.i .PHONY : regression.i # target to generate assembly for a file regression.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/regression.s .PHONY : regression.s # target to build an object file renderer.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.o .PHONY : renderer.o # target to preprocess a source file renderer.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.i .PHONY : renderer.i # target to generate assembly for a file renderer.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/renderer/renderer/CMakeFiles/renderer.dir/build.make examples/renderer/renderer/CMakeFiles/renderer.dir/renderer.s .PHONY : renderer.s # Help Target @@ -189,6 +189,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/renderer/renderer/cmake_install.cmake b/external/embree/bin/examples/renderer/renderer/cmake_install.cmake deleted file mode 100644 index ca2742240..000000000 --- a/external/embree/bin/examples/renderer/renderer/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/renderer/renderer - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/examples/tutorials/Makefile b/external/embree/bin/examples/tutorials/Makefile index 2f37b12b3..4079990db 100644 --- a/external/embree/bin/examples/tutorials/Makefile +++ b/external/embree/bin/examples/tutorials/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree2 +CMAKE_SOURCE_DIR = /usr/local/igl/libigl/external/embree # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree2/bin +CMAKE_BINARY_DIR = /usr/local/igl/libigl/external/embree/bin #============================================================================= # Targets provided globally by CMake. @@ -72,14 +72,14 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles /usr/local/igl/libigl/external/embree2/bin/examples/tutorials/CMakeFiles/progress.marks - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/all - $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree2/bin/CMakeFiles 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles /usr/local/igl/libigl/external/embree/bin/examples/tutorials/CMakeFiles/progress.marks + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/all + $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/igl/libigl/external/embree/bin/CMakeFiles 0 .PHONY : all # The main clean target clean: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/clean + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/clean .PHONY : clean # The main clean target @@ -88,22 +88,22 @@ clean/fast: clean # Prepare targets for installation. preinstall: all - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/preinstall .PHONY : preinstall # Prepare targets for installation. preinstall/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/preinstall + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/preinstall .PHONY : preinstall/fast # clear depends depend: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 .PHONY : depend # Convenience name for target. examples/tutorials/CMakeFiles/tutorial_host_device.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/CMakeFiles/tutorial_host_device.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/CMakeFiles/tutorial_host_device.dir/rule .PHONY : examples/tutorials/CMakeFiles/tutorial_host_device.dir/rule # Convenience name for target. @@ -112,12 +112,12 @@ tutorial_host_device: examples/tutorials/CMakeFiles/tutorial_host_device.dir/rul # fast build rule for target. tutorial_host_device/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/build .PHONY : tutorial_host_device/fast # Convenience name for target. examples/tutorials/CMakeFiles/tutorials.dir/rule: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/CMakeFiles/tutorials.dir/rule + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f CMakeFiles/Makefile2 examples/tutorials/CMakeFiles/tutorials.dir/rule .PHONY : examples/tutorials/CMakeFiles/tutorials.dir/rule # Convenience name for target. @@ -126,52 +126,52 @@ tutorials: examples/tutorials/CMakeFiles/tutorials.dir/rule # fast build rule for target. tutorials/fast: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/build + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/build .PHONY : tutorials/fast # target to build an object file glutdisplay.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.o .PHONY : glutdisplay.o # target to preprocess a source file glutdisplay.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.i .PHONY : glutdisplay.i # target to generate assembly for a file glutdisplay.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/glutdisplay.s .PHONY : glutdisplay.s # target to build an object file obj_loader.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.o .PHONY : obj_loader.o # target to preprocess a source file obj_loader.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.i .PHONY : obj_loader.i # target to generate assembly for a file obj_loader.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorials.dir/build.make examples/tutorials/CMakeFiles/tutorials.dir/obj_loader.s .PHONY : obj_loader.s # target to build an object file tutorials_host_device.o: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.o + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.o .PHONY : tutorials_host_device.o # target to preprocess a source file tutorials_host_device.i: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.i + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.i .PHONY : tutorials_host_device.i # target to generate assembly for a file tutorials_host_device.s: - cd /usr/local/igl/libigl/external/embree2/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.s + cd /usr/local/igl/libigl/external/embree/bin && $(MAKE) -f examples/tutorials/CMakeFiles/tutorial_host_device.dir/build.make examples/tutorials/CMakeFiles/tutorial_host_device.dir/tutorials_host_device.s .PHONY : tutorials_host_device.s # Help Target @@ -204,6 +204,6 @@ help: # No rule that depends on this can have commands that come from listfiles # because they might be regenerated. cmake_check_build_system: - cd /usr/local/igl/libigl/external/embree2/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 + cd /usr/local/igl/libigl/external/embree/bin && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 .PHONY : cmake_check_build_system diff --git a/external/embree/bin/examples/tutorials/cmake_install.cmake b/external/embree/bin/examples/tutorials/cmake_install.cmake deleted file mode 100644 index 048c08ca4..000000000 --- a/external/embree/bin/examples/tutorials/cmake_install.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Install script for directory: /usr/local/igl/libigl/external/embree2/examples/tutorials - -# Set the install prefix -IF(NOT DEFINED CMAKE_INSTALL_PREFIX) - SET(CMAKE_INSTALL_PREFIX "/usr/local") -ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX) -STRING(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -IF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - IF(BUILD_TYPE) - STRING(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - ELSE(BUILD_TYPE) - SET(CMAKE_INSTALL_CONFIG_NAME "Release") - ENDIF(BUILD_TYPE) - MESSAGE(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -ENDIF(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - -# Set the component getting installed. -IF(NOT CMAKE_INSTALL_COMPONENT) - IF(COMPONENT) - MESSAGE(STATUS "Install component: \"${COMPONENT}\"") - SET(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - ELSE(COMPONENT) - SET(CMAKE_INSTALL_COMPONENT) - ENDIF(COMPONENT) -ENDIF(NOT CMAKE_INSTALL_COMPONENT) - diff --git a/external/embree/bin/renderer b/external/embree/bin/renderer index 07c2758d6..7cda78bc7 100755 Binary files a/external/embree/bin/renderer and b/external/embree/bin/renderer differ diff --git a/external/embree/bin/renderer_server b/external/embree/bin/renderer_server index 4e7053c53..af584fe13 100755 Binary files a/external/embree/bin/renderer_server and b/external/embree/bin/renderer_server differ diff --git a/external/embree/cmake/FindCOI.cmake b/external/embree/cmake/FindCOI.cmake deleted file mode 100644 index 0d6ef5d5b..000000000 --- a/external/embree/cmake/FindCOI.cmake +++ /dev/null @@ -1,36 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -INCLUDE_DIRECTORIES(/opt/intel/mic/coi/include) - -FIND_PATH(COI_INCLUDE_PATH source/COIProcess_source.h /opt/intel/mic/coi/include) -FIND_PATH(COI_HOST_LIBRARY_DIR libcoi_host.so /opt/intel/mic/coi/host-linux-release/lib/) -FIND_PATH(COI_DEV_LIBRARY_DIR libcoi_device.so /opt/intel/mic/coi/device-linux-release/lib/) - -IF (COI_INCLUDE_PATH AND COI_HOST_LIBRARY_DIR AND COI_DEV_LIBRARY_DIR) - SET(COI_FOUND TRUE) - SET(COI_INCLUDE_PATHS ${COI_INCLUDE_PATH}) - SET(COI_HOST_LIBRARIES ${COI_HOST_LIBRARY_DIR}/libcoi_host.so) - SET(COI_DEV_LIBRARIES ${COI_DEV_LIBRARY_DIR}/libcoi_device.so) -ENDIF () - -MARK_AS_ADVANCED(COI_INCLUDE_PATH) -MARK_AS_ADVANCED(COI_HOST_LIBRARY_DIR) -MARK_AS_ADVANCED(COI_DEV_LIBRARY_DIR) - -MARK_AS_ADVANCED(COI_INCLUDE_PATHS) -MARK_AS_ADVANCED(COI_HOST_LIBRARIES) -MARK_AS_ADVANCED(COI_DEV_LIBRARIES) diff --git a/external/embree/cmake/build_clang.cmake b/external/embree/cmake/build_clang.cmake deleted file mode 100644 index 06c49d542..000000000 --- a/external/embree/cmake/build_clang.cmake +++ /dev/null @@ -1,57 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(COMPILER_TARGET "SSE4.2" CACHE INT "SIMD version to use (SSSE3,SSE4.1,SSE4.2,AVX,AVX-I,AVX2)") - -IF(COMPILER_TARGET STREQUAL "SSSE3") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-mssse3") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.1") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-msse4.1") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.2") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-msse4.2") -ELSEIF(COMPILER_TARGET STREQUAL "AVX") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx -mvzeroupper") -ELSEIF(COMPILER_TARGET STREQUAL "AVX-I") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx2 -mvzeroupper") -ELSEIF(COMPILER_TARGET STREQUAL "AVX2") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx2 -mvzeroupper") -ELSE() - MESSAGE(FATAL_ERROR "SIMD Version ${COMPILER_TARGET} not supported use SSSE3, SSE4.1, SSE4.2, AVX, AVX-I, or AVX2" ) -ENDIF() - -SET(CMAKE_CXX_COMPILER "clang++") -SET(CMAKE_C_COMPILER "clang") -SET(CMAKE_CXX_FLAGS "-fPIC -ffast-math -fvisibility-inlines-hidden -fvisibility=hidden ${SIMD_FLAGS}") -SET(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g -O0 -ftree-ter") -SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -g -O3") -SET(CMAKE_EXE_LINKER_FLAGS "") - -SET(BUILD_FOR_XEON_PHI OFF) -MARK_AS_ADVANCED(BUILD_FOR_XEON_PHI) - -SET(EXT "") diff --git a/external/embree/cmake/build_gcc.cmake b/external/embree/cmake/build_gcc.cmake deleted file mode 100644 index 0a1a62108..000000000 --- a/external/embree/cmake/build_gcc.cmake +++ /dev/null @@ -1,57 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(COMPILER_TARGET "SSE4.2" CACHE INT "SIMD version to use (SSSE3,SSE4.1,SSE4.2,AVX,AVX-I,AVX2)") - -IF(COMPILER_TARGET STREQUAL "SSSE3") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-mssse3") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.1") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-msse4.1") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.2") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-msse4.2") -ELSEIF(COMPILER_TARGET STREQUAL "AVX") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx") -ELSEIF(COMPILER_TARGET STREQUAL "AVX-I") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx2") -ELSEIF(COMPILER_TARGET STREQUAL "AVX2") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-mavx2") -ELSE() - MESSAGE(FATAL_ERROR "SIMD Version ${COMPILER_TARGET} not supported use SSSE3, SSE4.1, SSE4.2, AVX, AVX-I, or AVX2" ) -ENDIF() - -SET(CMAKE_CXX_COMPILER "g++") -SET(CMAKE_C_COMPILER "gcc") -SET(CMAKE_CXX_FLAGS "-fPIC -ffast-math -fvisibility-inlines-hidden -fvisibility=hidden ${SIMD_FLAGS}") -SET(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g -O0 -ftree-ter") -SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -g -O3 -Wstrict-aliasing=0") -SET(CMAKE_EXE_LINKER_FLAGS "") - -SET(BUILD_FOR_XEON_PHI OFF) -MARK_AS_ADVANCED(BUILD_FOR_XEON_PHI) - -SET(EXT "") diff --git a/external/embree/cmake/build_icc.cmake b/external/embree/cmake/build_icc.cmake deleted file mode 100644 index ab403c881..000000000 --- a/external/embree/cmake/build_icc.cmake +++ /dev/null @@ -1,61 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(COMPILER_TARGET "SSE4.2" CACHE INT "SIMD version to use (SSSE3,SSE4.1,SSE4.2,AVX,AVX-I,AVX2)") - -IF(COMPILER_TARGET STREQUAL "SSSE3") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-xssse3") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.1") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-xsse4.1") -ELSEIF(COMPILER_TARGET STREQUAL "SSE4.2") - SET(__SSE__ 1) - SET(__AVX__ 0) - SET(SIMD_FLAGS "-xsse4.2") -ELSEIF(COMPILER_TARGET STREQUAL "AVX") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-xAVX") -ELSEIF(COMPILER_TARGET STREQUAL "AVX-I") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-xCORE-AVX-I") -ELSEIF(COMPILER_TARGET STREQUAL "AVX2") - SET(__SSE__ 1) - SET(__AVX__ 1) - SET(SIMD_FLAGS "-xCORE-AVX2") -ELSE() - MESSAGE(FATAL_ERROR "SIMD Version ${COMPILER_TARGET} not supported use SSSE3, SSE4.1, SSE4.2, AVX, AVX-I, or AVX2" ) -ENDIF() - -SET(CMAKE_CXX_COMPILER "icpc") -SET(CMAKE_C_COMPILER "icc") -SET(CMAKE_CXX_FLAGS "-Wall -fPIC -fp-model fast -fvisibility-inlines-hidden -fvisibility=hidden ${SIMD_FLAGS} -restrict") -SET(CMAKE_CXX_FLAGS_DEBUG "-DDEBUG -g -O0") -SET(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -O3 -fimf-precision=low -no-inline-max-total-size -inline-factor=20 -no-prec-div -no-prec-sqrt ") # -g -SET(CMAKE_EXE_LINKER_FLAGS "") - -IF (APPLE) - SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} -dynamiclib) -ENDIF (APPLE) - -SET(BUILD_FOR_XEON_PHI OFF) -MARK_AS_ADVANCED(BUILD_FOR_XEON_PHI) - -SET(EXT "") diff --git a/external/embree/cmake/build_icc_mic.cmake b/external/embree/cmake/build_icc_mic.cmake deleted file mode 100644 index 42be90bf9..000000000 --- a/external/embree/cmake/build_icc_mic.cmake +++ /dev/null @@ -1,35 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -#SET(COMPILER_TARGET "MIC" CACHE STRING "SSE version to use (SSSE3,SSE4.1,SSE4.2,AVX)" FORCE) - -SET(__SSE__ 0) -SET(__AVX__ 0) - -SET (CMAKE_CXX_COMPILER icpc) -SET (CMAKE_CXX_FLAGS "-mmic -restrict -Wall -fasm-blocks -fPIC") -SET (CMAKE_CXX_FLAGS_NOOPT "-O0 -DDEBUG") -SET (CMAKE_CXX_FLAGS_DEBUG "-g -w1 -O2 -DDEBUG ") - -# -ansi-alias # ISPC not working with ansi-alias flag - -SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -mCG_lrb_num_threads=4 -mCG_lrb_num_threads=4 -fp-model fast -fimf-precision=low -fasm-blocks -no-inline-max-total-size -inline-factor=200 -fPIC -fma -restrict -no-prec-div -no-prec-sqrt -mGLOB_default_function_attrs=\"use_vec_for_imul=on;use_fast_math=on;gather_scatter_loop_jknzd=on;gather_scatter_loop_unroll=2;use_gather_scatter_hint=on;c_lrb_avoid_vector_insts_with_rip=on;c_avoid_bank_conflicts=on;c_sch_nop_insertion=on;c_avoid_movz_and_movs=off;c_avoid_integer_ciscization=on;avoid_stall_between_all_insts=on;avoid_long_vector_ints=on;avoid_loads_with_extend=on;smart_mem_conflicts=on\" -mP2OPT_hlo_prefetch=F ") - -SET(CMAKE_LINKER icpc) -SET(CMAKE_CXX_LINK_EXECUTABLE " -mmic -static-intel -L/opt/intel/composerxe_mic/compiler/lib/mic -rdynamic -fPIC -L/opt/intel/mic/coi/device-linux-release/lib -o ${CMAKE_GNULD_IMAGE_VERSION} -zmuldefs") -SET(CMAKE_CXX_CREATE_SHARED_LIBRARY " -mmic -static-intel -L/opt/intel/composerxe_mic/compiler/lib/mic/ -L/opt/intel/mic/coi/device-linux-release -o ${CMAKE_GNULD_IMAGE_VERSION} -zmuldefs") - -SET(EXT "_knc") diff --git a/external/embree/cmake/build_ispc.cmake b/external/embree/cmake/build_ispc.cmake deleted file mode 100644 index df9ef2d78..000000000 --- a/external/embree/cmake/build_ispc.cmake +++ /dev/null @@ -1,108 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(ISPC_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${ISPC_TARGET_DIR}) - -SET(ISPC_DIR $ENV{ISPC_DIR} CACHE STRING "Path to ISPC root dir.") -MARK_AS_ADVANCED(ISPC_DIR) - -IF (${TARGET_SPMD} STREQUAL "knc") - INCLUDE(build_icc_mic) - SET(IVL_TARGET "knc") - SET (ISPC_TARGET generic-16 --emit-c++ --c++-include-file=${ISPC_DIR}/examples/intrinsics/knc.h) - INCLUDE_DIRECTORIES(/opt/intel/mic/coi/include) - SET (ISPC_TARGET_EXT "cpp") - SET (ISPC_TARGET_DEFINE __MIC__) - ADD_DEFINITIONS(-D__ISPC_TARGET_MIC__) -ELSEIF (${TARGET_SPMD} STREQUAL "avx") - SET (ISPC_TARGET avx) - SET (ISPC_TARGET_EXT o) - SET (ISPC_TARGET_DEFINE __AVX__) - ADD_DEFINITIONS(-D__ISPC_TARGET_AVX__) -ELSEIF (${TARGET_SPMD} STREQUAL "sse") - SET (ISPC_TARGET sse4) - SET (ISPC_TARGET_EXT o) - SET (ISPC_TARGET_DEFINE __SSE4__) - ADD_DEFINITIONS(-D__ISPC_TARGET_SSE__) -ELSE () - MESSAGE(FATAL_ERROR "Unknown backend specified: " ${TARGET_SPMD}) -ENDIF () - -####################################################### -# rule to compile .ispc file to .dev.cpp and .dev.h -# Note that this is only a *rule*, so as long as no other -# library or executable actually *uses* the respective -# .dev.cpp file nothing at all will happen. -####################################################### -MACRO(ISPC_COMPILE _filename _dest_base) - - GET_FILENAME_COMPONENT(_basename ${_filename} NAME_WE) - GET_FILENAME_COMPONENT(_dirname ${_filename} PATH) - - IF("${_dirname}" STREQUAL "") - SET(_full_dir_name ${_dest_base}) - ELSE("${_dirname}" STREQUAL "") - SET(_full_dir_name ${_dest_base}/${_dirname}) - ENDIF("${_dirname}" STREQUAL "") - - SET(_out_base ${_full_dir_name}/${_basename}) - SET(_out_base2 ${ISPC_TARGET_DIR}/${_basename}) - - IF (EXISTS ${_out_base}.dev.idep) - FILE(READ ${_out_base}.dev.idep contents) - STRING(REGEX REPLACE " " ";" contents "${contents}") - STRING(REGEX REPLACE ";" "\\\\;" contents "${contents}") - STRING(REGEX REPLACE "\n" ";" contents "${contents}") - SET(deps "") - FOREACH(dep ${contents}) - IF (EXISTS ${dep}) - SET(deps ${deps} ${dep}) - ENDIF (EXISTS ${dep}) - ENDFOREACH(dep ${contents}) - ELSE (EXISTS ${_out_base}.dev.idep ) - SET(deps "") - ENDIF () - - ADD_CUSTOM_COMMAND( - OUTPUT ${_out_base}.dev.${ISPC_TARGET_EXT} ${_out_base2}_ispc.h - COMMAND mkdir -p ${_full_dir_name} \; ispc - -I ${CMAKE_CURRENT_SOURCE_DIR} - -D${ISPC_TARGET_DEFINE} - --pic - # FIXME -g - -O1 - --target ${ISPC_TARGET} - --wno-perf - --opt=fast-math - --opt=force-aligned-memory - -h ${_out_base2}_ispc.h - -o ${_out_base}.dev.${ISPC_TARGET_EXT} - -MMM ${_out_base}.dev.idep - ${CMAKE_CURRENT_SOURCE_DIR}/${_filename} - \; - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_filename} - ${deps}) - -ENDMACRO(ISPC_COMPILE) - -FOREACH(ispc_src ${ISPC_SOURCES}) - GET_FILENAME_COMPONENT(_basename ${ispc_src} NAME_WE) - GET_FILENAME_COMPONENT(_dirname ${ispc_src} PATH) - ISPC_COMPILE(${ispc_src} ${ISPC_TARGET_DIR}) - SET(SOURCES ${SOURCES} "${ISPC_TARGET_DIR}/${_dirname}/${_basename}.dev.${ISPC_TARGET_EXT}") -ENDFOREACH() - diff --git a/external/embree/examples/common/image/FindImageMagick.cmake b/external/embree/examples/common/image/FindImageMagick.cmake deleted file mode 100755 index bbb3ed730..000000000 --- a/external/embree/examples/common/image/FindImageMagick.cmake +++ /dev/null @@ -1,42 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(LIBRARY_PATHS - /usr/lib /usr/local/lib /opt/local/lib) - -FIND_PATH(IMAGEMAGICK_INCLUDE_PATH Magick++.h - /usr/include /usr/include/ImageMagick - /usr/local/include /usr/local/include/ImageMagick - /opt/local/include /opt/local/include/ImageMagick -) - -FIND_LIBRARY(IMAGEMAGICK_CXX_LIBRARY NAMES Magick++ PATHS ${LIBRARY_PATHS} ) -FIND_LIBRARY(IMAGEMAGICK_C_LIBRARY NAMES Magick MagickCore PATHS ${LIBRARY_PATHS} ) - -IF (IMAGEMAGICK_INCLUDE_PATH AND IMAGEMAGICK_CXX_LIBRARY AND IMAGEMAGICK_C_LIBRARY) - SET(IMAGEMAGICK_FOUND TRUE) - SET(IMAGEMAGICK_INCLUDE_PATHS ${IMAGEMAGICK_INCLUDE_PATH} CACHE STRING "ImageMagick include paths") - SET(IMAGEMAGICK_LIBRARIES ${IMAGEMAGICK_CXX_LIBRARY} ${IMAGEMAGICK_C_LIBRARY} CACHE STRING "ImageMagick Libraries") -ENDIF (IMAGEMAGICK_INCLUDE_PATH AND IMAGEMAGICK_CXX_LIBRARY AND IMAGEMAGICK_C_LIBRARY) - -MARK_AS_ADVANCED( - IMAGEMAGICK_FOUND - IMAGEMAGICK_INCLUDE_PATHS - IMAGEMAGICK_LIBRARIES - IMAGEMAGICK_CXX_LIBRARY - IMAGEMAGICK_C_LIBRARY - IMAGEMAGICK_INCLUDE_PATH -) diff --git a/external/embree/examples/common/image/FindOpenEXR.cmake b/external/embree/examples/common/image/FindOpenEXR.cmake deleted file mode 100755 index c3e37973c..000000000 --- a/external/embree/examples/common/image/FindOpenEXR.cmake +++ /dev/null @@ -1,47 +0,0 @@ -## ======================================================================== ## -## Copyright 2009-2013 Intel Corporation ## -## ## -## Licensed under the Apache License, Version 2.0 (the "License"); ## -## you may not use this file except in compliance with the License. ## -## You may obtain a copy of the License at ## -## ## -## http://www.apache.org/licenses/LICENSE-2.0 ## -## ## -## Unless required by applicable law or agreed to in writing, software ## -## distributed under the License is distributed on an "AS IS" BASIS, ## -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ## -## See the License for the specific language governing permissions and ## -## limitations under the License. ## -## ======================================================================== ## - -SET(LIBRARY_PATHS - /usr/lib /usr/local/lib /opt/local/lib) - -FIND_PATH(OPENEXR_INCLUDE_PATH ImfHeader.h - /usr/include /usr/include/OpenEXR - /usr/local/include /usr/local/include/OpenEXR - /opt/local/include /opt/local/include/OpenEXR) - -FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_IEX_LIBRARY NAMES Iex PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf PATHS ${LIBRARY_PATHS}) -FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread PATHS ${LIBRARY_PATHS}) - -IF (OPENEXR_INCLUDE_PATH AND OPENEXR_HALF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_ILMTHREAD_LIBRARY) - SET(OPENEXR_FOUND TRUE) - SET(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_PATH} CACHE STRING "OpenEXR include paths") - SET(OPENEXR_LIBRARIES ${OPENEXR_HALF_LIBRARY} ${OPENEXR_IEX_LIBRARY} ${OPENEXR_IMATH_LIBRARY} ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_ILMTHREAD_LIBRARY} CACHE STRING "OpenEXR Libraries") -ENDIF () - -MARK_AS_ADVANCED( - OPENEXR_FOUND - OPENEXR_INCLUDE_PATHS - OPENEXR_LIBRARIES - OPENEXR_INCLUDE_PATH - OPENEXR_HALF_LIBRARY - OPENEXR_IEX_LIBRARY - OPENEXR_IMATH_LIBRARY - OPENEXR_ILMIMF_LIBRARY - OPENEXR_ILMTHREAD_LIBRARY -) diff --git a/include/igl/embree/EmbreeIntersector.h b/include/igl/embree/EmbreeIntersector.h index 9ebf4d4c7..b86ec1529 100644 --- a/include/igl/embree/EmbreeIntersector.h +++ b/include/igl/embree/EmbreeIntersector.h @@ -7,20 +7,15 @@ #ifndef IGL_EMBREE_INTERSECTOR_H #define IGL_EMBREE_INTERSECTOR_H -#include "include/embree.h" -#include "include/intersector1.h" -#include "common/ray.h" +#include "Hit.h" +#include +#include +#include +#include #include namespace igl { - struct Hit - { - int id; // primitive id - float u,v; // barycentric coordinates - float t; // distance = direction*t to intersection - }; - template < typename Scalar, typename Index> @@ -32,10 +27,9 @@ namespace igl public: // V #V by 3 list of vertex positions // F #F by 3 list of Oriented triangles - EmbreeIntersector(); EmbreeIntersector( - const PointMatrixType & V, - const FaceMatrixType & F, + const PointMatrixType & V = PointMatrixType(), + const FaceMatrixType & F = FaceMatrixType(), const char* structure = "default", const char* builder = "default", const char* traverser = "default"); @@ -97,24 +91,6 @@ namespace igl template inline embree::Vector3f toVector3f(const RowVector3 &p) { return embree::Vector3f((float)p[0], (float)p[1], (float)p[2]); } -template < -typename Scalar, -typename Index> -igl::EmbreeIntersector < Scalar, Index> -::EmbreeIntersector() -{ - static bool inited = false; - if(!inited) - { - embree::rtcInit(); -#ifdef VERBOSE - embree::rtcSetVerbose(3); -#endif - embree::rtcStartThreads(); - inited = true; - } -} - template < typename Scalar, typename Index> @@ -124,17 +100,30 @@ igl::EmbreeIntersector < Scalar, Index> const char* structure, const char* builder, const char* traverser) + : + mesh(NULL), + triangles(NULL), + vertices(NULL), + intersector(NULL) { + using namespace std; static bool inited = false; if(!inited) { + cout<<"before rtcInit()"< template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename DerivedP, typename DerivedN, typename DerivedS > void igl::ambient_occlusion( - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, const Eigen::PlainObjectBase & P, const Eigen::PlainObjectBase & N, const int num_samples, @@ -39,7 +38,7 @@ void igl::ambient_occlusion( // reverse ray d *= -1; } - embree::Hit hit; + igl::Hit hit; if(ei.intersectRay(origin,d,hit)) { num_hits++; @@ -66,15 +65,13 @@ void igl::ambient_occlusion( using namespace igl; using namespace Eigen; EmbreeIntersector< - PlainObjectBase, - PlainObjectBase, - Matrix > ei(V,F); + typename DerivedV::Scalar, + typename DerivedF::Scalar > ei(V,F); return ambient_occlusion(ei,P,N,num_samples,S); } #ifndef IGL_HEADER_ONLY // Explicit template instanciation -template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector, Eigen::Matrix, Eigen::Matrix > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, const int, Eigen::PlainObjectBase >&); -template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); -template void igl::ambient_occlusion >, Eigen::PlainObjectBase >, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector >, Eigen::PlainObjectBase >, Eigen::Matrix > const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); +template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); +template void igl::ambient_occlusion, Eigen::Matrix, Eigen::Matrix >(igl::EmbreeIntersector const&, Eigen::PlainObjectBase > const&, Eigen::PlainObjectBase > const&, int, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/embree/ambient_occlusion.h b/include/igl/embree/ambient_occlusion.h index e482d48ad..0f999c078 100644 --- a/include/igl/embree/ambient_occlusion.h +++ b/include/igl/embree/ambient_occlusion.h @@ -6,9 +6,8 @@ namespace igl { // Forward define template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3> + typename Scalar, + typename Index> class EmbreeIntersector; // Compute ambient occlusion per given point // @@ -21,14 +20,13 @@ namespace igl // (not occluded) // template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename DerivedP, typename DerivedN, typename DerivedS > void ambient_occlusion( - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, const Eigen::PlainObjectBase & P, const Eigen::PlainObjectBase & N, const int num_samples, diff --git a/include/igl/embree/bone_visible.cpp b/include/igl/embree/bone_visible.cpp index 65326b0c0..7611ddc53 100644 --- a/include/igl/embree/bone_visible.cpp +++ b/include/igl/embree/bone_visible.cpp @@ -26,8 +26,8 @@ IGL_INLINE void igl::bone_visible( FF.resize(F.rows()*2,F.cols()); FF << F, F.rowwise().reverse(); // Initialize intersector - const EmbreeIntersector ei = - EmbreeIntersector(V,FF); + const EmbreeIntersector ei = + EmbreeIntersector(V,FF); const double sd_norm = (s-d).norm(); // Embree seems to be parallel when constructing but not when tracing rays #pragma omp parallel for @@ -64,14 +64,14 @@ IGL_INLINE void igl::bone_visible( projv = d; } } - embree::Hit hit; + igl::Hit hit; // perhaps 1.0 should be 1.0-epsilon, or actually since we checking the // incident face, perhaps 1.0 should be 1.0+eps const Vector3d dir = (Vv-projv)*1.0; if(ei.intersectSegment(projv,dir, hit)) { // mod for double sided lighting - const int fi = hit.id0 % F.rows(); + const int fi = hit.id % F.rows(); //if(v == 1228-1) //{ diff --git a/include/igl/embree/orient_outward_ao.cpp b/include/igl/embree/orient_outward_ao.cpp index 441b6be73..09418f27e 100644 --- a/include/igl/embree/orient_outward_ao.cpp +++ b/include/igl/embree/orient_outward_ao.cpp @@ -13,16 +13,15 @@ template < typename DerivedV, typename DerivedF, typename DerivedC, - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename DerivedFF, typename DerivedI> IGL_INLINE void igl::orient_outward_ao( const Eigen::PlainObjectBase & V, const Eigen::PlainObjectBase & F, const Eigen::PlainObjectBase & C, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, const int num_samples, Eigen::PlainObjectBase & FF, Eigen::PlainObjectBase & I) @@ -142,9 +141,8 @@ IGL_INLINE void igl::orient_outward_ao( F2.resize(F.rows()*2,F.cols()); F2 << F, F.rowwise().reverse().eval(); EmbreeIntersector< - PlainObjectBase, - PlainObjectBase, - Matrix > ei(V,F2); + typename DerivedV::Scalar, + typename DerivedF::Scalar > ei(V,F2); return orient_outward_ao(V, F, C, ei, num_samples, FF, I); } diff --git a/include/igl/embree/orient_outward_ao.h b/include/igl/embree/orient_outward_ao.h index 84a43777d..932e81092 100644 --- a/include/igl/embree/orient_outward_ao.h +++ b/include/igl/embree/orient_outward_ao.h @@ -6,9 +6,8 @@ namespace igl { // Forward define template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3> + typename Scalar, + typename Index> class EmbreeIntersector; // Orient each component (identified by C) of a mesh (V,F) using ambient occlusion // such that the front side is less occluded than back side @@ -27,16 +26,15 @@ namespace igl typename DerivedV, typename DerivedF, typename DerivedC, - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename DerivedFF, typename DerivedI> IGL_INLINE void orient_outward_ao( const Eigen::PlainObjectBase & V, const Eigen::PlainObjectBase & F, const Eigen::PlainObjectBase & C, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, const int num_samples, Eigen::PlainObjectBase & FF, Eigen::PlainObjectBase & I); diff --git a/include/igl/embree/unproject_in_mesh.cpp b/include/igl/embree/unproject_in_mesh.cpp index ae5b5f0ff..79123e074 100644 --- a/include/igl/embree/unproject_in_mesh.cpp +++ b/include/igl/embree/unproject_in_mesh.cpp @@ -4,31 +4,29 @@ #include template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename Derivedobj> int igl::unproject_in_mesh( const int x, const int y, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, Eigen::PlainObjectBase & obj) { - std::vector hits; + std::vector hits; return igl::unproject_in_mesh(x,y,ei,obj,hits); } template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename Derivedobj> int igl::unproject_in_mesh( const int x, const int y, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, Eigen::PlainObjectBase & obj, - std::vector & hits) + std::vector & hits) { using namespace igl; using namespace std; @@ -65,5 +63,4 @@ int igl::unproject_in_mesh( } #ifndef IGL_HEADER_ONLY -template int igl::unproject_in_mesh, Eigen::Matrix, Eigen::Matrix, Eigen::Matrix >(int, int, igl::EmbreeIntersector, Eigen::Matrix, Eigen::Matrix > const&, Eigen::PlainObjectBase >&); #endif diff --git a/include/igl/embree/unproject_in_mesh.h b/include/igl/embree/unproject_in_mesh.h index 39fb6480e..dde72030f 100644 --- a/include/igl/embree/unproject_in_mesh.h +++ b/include/igl/embree/unproject_in_mesh.h @@ -4,15 +4,14 @@ #include #include -#include "Embree_convenience.h" +#include "Hit.h" namespace igl { // Forward define template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3> + typename Scalar, + typename Index> class EmbreeIntersector; // Unproject a screen location (using current opengl viewport, projection, and // model view) to a 3D position @@ -26,27 +25,25 @@ namespace igl // Returns number of hits // template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename Derivedobj> int unproject_in_mesh( const int x, const int y, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, Eigen::PlainObjectBase & obj); template < - typename PointMatrixType, - typename FaceMatrixType, - typename RowVector3, + typename Scalar, + typename Index, typename Derivedobj> int unproject_in_mesh( const int x, const int y, - const igl::EmbreeIntersector & ei, + const igl::EmbreeIntersector & ei, Eigen::PlainObjectBase & obj, - std::vector & hits); + std::vector & hits); } #ifdef IGL_HEADER_ONLY # include "unproject_in_mesh.cpp"