Commit Graph
141 Commits
Author SHA1 Message Date
Jérémie Dumas 9f8ee20cdc Put back CGAL::CGAL_Core. 2018-07-09 14:18:31 -04:00
Jérémie Dumas cc70e37a57 FindCGAL.cmake not needed for CGAL >= 4.12. 2018-07-07 20:28:52 -04:00
Jérémie Dumas ab9d7a1a0c Update CGAL dependency to 4.12, and add CGAL as a submodule. 2018-07-07 20:15:49 -04:00
Jérémie Dumas b52e8fe180 Update ImGui menu + update tutorial. 2018-03-10 10:16:27 -05:00
Jérémie Dumas 775d55d879 CMake fix. 2018-03-01 21:04:04 -05:00
Jérémie Dumas a99bc6a2eb Minor tweaks. 2018-03-01 20:29:01 -05:00
Jérémie Dumas 35d6d67311 Merge remote-tracking branch 'upstream/master' into cgal 2018-03-01 19:13:37 -05:00
Alec Jacobson bfa424b341 imgui off by default; do not unset user's option if module not found 2018-02-23 09:18:21 -05:00
Jérémie Dumas 9ac4d1d032 Use local boost folder if available. 2018-02-16 22:08:31 -05:00
Jérémie Dumas e546482279 Cleanup 2018-02-16 21:49:16 -05:00
Jérémie Dumas 73aafb4255 Fix DLL copy for CGAL + add build instruction for Windows. 2018-02-16 21:45:46 -05:00
Jérémie Dumas 5aa1360ab8 Merge remote-tracking branch 'origin/master' into cgal 2018-02-16 20:17:42 -05:00
Jérémie Dumas e369e54656 Working on getting boost external project to work. 2018-02-16 20:14:20 -05:00
Alec Jacobson 1798003120 merge 2018-02-14 21:38:34 -05:00
Jérémie Dumas dd1bf2583a Boost why U keep failing. 2018-02-13 17:20:51 -05:00
Jérémie Dumas 0e7c36165f Boost attempt 12974. 2018-02-13 14:24:09 -05:00
Jérémie Dumas c80bca2e53 Grrr Boost. 2018-02-13 14:02:49 -05:00
Jérémie Dumas 9d0aa37229 Grrr Boost. 2018-02-13 13:46:42 -05:00
Jérémie Dumas 163a7cd835 Try setting env variable. 2018-02-13 13:18:10 -05:00
Jérémie Dumas 0b67fe2be5 Try to set Boost root. 2018-02-13 12:31:01 -05:00
Jérémie Dumas ce9fa48f5d Update multi-mesh tutorial + drop opengl2/ from CMake. 2018-02-10 19:57:45 -05:00
Jérémie Dumas 519297bd28 Update ViewerMenu tutorial with ImGui. 2018-02-10 18:30:21 -05:00
Jérémie Dumas fe6520dab5 Transition OpenGL loader to glad. 2018-02-10 16:11:09 -05:00
Alec Jacobson 321343d402 Fix CMake that was overwriting desired options when not found 2018-02-08 10:40:53 -05:00
Daniele Panozzo dc226a5810 - viewerdata and meshgl are merged
- meshgl objects are automatically initialized (but manually freed)
- moved the data->meshgl conversion inside viewerdata to keep meshgl generic
2018-02-04 17:48:07 -05:00
Daniele Panozzo 8d2967ebdc Merge branch 'viewer-refactor' of https://github.com/libigl/libigl into viewer_refactor
# Conflicts:
#	include/igl/opengl/State.cpp
#	include/igl/opengl/glfw/Viewer.cpp
#	shared/cmake/libigl.cmake
#	tutorial/609_Boolean/CMakeLists.txt
#	tutorial/704_SignedDistance/main.cpp
2018-02-03 20:15:02 -05:00
Alec Jacobson 9a805a9764 Merge branch 'master' of github.com:libigl/libigl into alecjacobson 2018-01-30 10:06:43 -05:00
Alec Jacobson 5e29bdad94 capitalization matters 2018-01-28 12:06:54 -05:00
Alec Jacobson 10700868a8 matlab is a built in module for cmake, use defaults instead 2018-01-25 14:30:32 -05:00
Unknown dc31807ff5 Misc. typos
Most are non-user facing. Hope this is not too annoying of a PR. 

Used `codespell -d -q 3 --skip="*.po,*.ts,./.git,./external"` to locate typos
2018-01-14 06:07:31 -05:00
Alec Jacobson a8f5ca98ee merge 2017-12-18 08:20:12 -05:00
Alec Jacobson fb45c43f72 Fix bug in new cmake file, cgal overwriting cmake flags 2017-12-03 10:25:12 +07:00
Jérémie Dumas 20c2792aa8 Update libigl.cmake 2017-11-17 20:56:52 -05:00
gaoxifeng f41a74321d fixed libigl.cmake for linux 2017-11-17 18:10:15 -05:00
Alec Jacobson b257703097 merge 2017-11-15 15:51:21 -05:00
Jérémie Dumas ee02dfaa76 Try to adapt CGAL external project for Windows. 2017-11-04 13:00:02 -04:00
Jérémie Dumas 3c86ad133c Experimenting with CGAL as an external CMake project. 2017-11-04 10:14:17 -04:00
Jérémie Dumas 56be2e0c58 Copy lib files only if it is a DLL. 2017-11-03 21:22:41 -04:00
Jérémie Dumas f61c0d5271 Fix CGAL include paths on Windows when CGAL is installed outside its source directory. 2017-11-03 21:07:08 -04:00
Jérémie Dumas 1d42c858a6 Check that input dll exists before copying it. 2017-11-03 19:38:30 -04:00
Jérémie Dumas 7bce35d70c Fix missing template instantiation when compiling with CGAL on Windows.
Also adds a convenience function to copy CGAL's dll into the target
executable folder.
2017-11-03 18:36:21 -04:00
gaoxifeng 9fc184f64b updated libigl.cmake 2017-11-03 03:02:36 -04:00
Jérémie Dumas 2d6ee9a017 Minor fixes in CMake build script. 2017-10-29 16:39:04 -04:00
Alec Jacobson 08e7f411ee note about png anomaly 2017-10-13 16:05:29 -04:00
Alec Jacobson b2c6240f81 fix missing copyleft/opengl2 2017-10-13 15:49:30 -04:00
Alec Jacobson ab2559bafe merge 2017-10-13 12:35:44 -04:00
Alec Jacobson 9bc8064132 merge 2017-10-13 10:22:58 -04:00
Alec Jacobson 0126b9ccfc merge 2017-10-12 09:18:06 -04:00
Daniele Panozzo e3c296f834 gcc 4.8 crashes while compiling embree. Disabling it for the linux build 2017-10-11 01:00:31 -04:00
Daniele Panozzo 396fa1555b minor cgal fix 2017-10-10 22:30:01 -04:00