Commit Graph
148 Commits
Author SHA1 Message Date
Alec Jacobson 45acb3a583 adding explicit FindMATLAB.cmake (from cmake 3.10.2), because cmake 3.12.3's broke our build
Former-commit-id: d68f2f4cc2
2018-10-10 08:49:07 -04:00
Alec Jacobson 374dc99914 fix anttweakbar includes
Former-commit-id: 1eafacccdb
2018-09-23 15:01:47 -04:00
Daniele Panozzo ed843f6e6d Merge branch 'cgal' of https://github.com/jdumas/libigl into jdumas-cgal
Former-commit-id: 68c3b59036
2018-07-12 16:44:31 -04:00
Jérémie Dumas bfef8defa7 Put back CGAL::CGAL_Core.
Former-commit-id: 9f8ee20cdc
2018-07-09 14:18:31 -04:00
Jérémie Dumas 8e7b1147d2 FindCGAL.cmake not needed for CGAL >= 4.12.
Former-commit-id: cc70e37a57
2018-07-07 20:28:52 -04:00
Jérémie Dumas 2d71d76222 Update CGAL dependency to 4.12, and add CGAL as a submodule.
Former-commit-id: ab9d7a1a0c
2018-07-07 20:15:49 -04:00
Alec Jacobson 1a9c17df6f missing cork libs
Former-commit-id: 3ff1edcd02
2018-06-15 10:48:16 -04:00
Alec Jacobson 6758c2e117 [bug fix]: xml includes handled wrong
Former-commit-id: 5e403fa539
2018-06-02 12:27:39 -04:00
Alec Jacobson 61f7163750 use correct names
Former-commit-id: aaf9a3f3f0
2018-05-24 23:17:57 -04:00
Alec Jacobson 2bc4a2fb18 hotfix for ar issue on mac os x
Former-commit-id: 55ee24a3bd
2018-04-20 09:28:10 -04:00
Jérémie Dumas 039ca104c2 Update ImGui menu + update tutorial.
Former-commit-id: b52e8fe180
2018-03-10 10:16:27 -05:00
Jérémie Dumas f2a8f0de4d CMake fix.
Former-commit-id: 775d55d879
2018-03-01 21:04:04 -05:00
Jérémie Dumas f687c078b2 Minor tweaks.
Former-commit-id: a99bc6a2eb
2018-03-01 20:29:01 -05:00
Jérémie Dumas 162d26a78d Merge remote-tracking branch 'upstream/master' into cgal
Former-commit-id: 35d6d67311
2018-03-01 19:13:37 -05:00
Alec Jacobson 8dc1a15835 imgui off by default; do not unset user's option if module not found
Former-commit-id: bfa424b341
2018-02-23 09:18:21 -05:00
Jérémie Dumas df7c1fb8ff Use local boost folder if available.
Former-commit-id: 9ac4d1d032
2018-02-16 22:08:31 -05:00
Jérémie Dumas 40c37fa327 Cleanup
Former-commit-id: e546482279
2018-02-16 21:49:16 -05:00
Jérémie Dumas 901f15dc25 Fix DLL copy for CGAL + add build instruction for Windows.
Former-commit-id: 73aafb4255
2018-02-16 21:45:46 -05:00
Jérémie Dumas a5635bf05f Merge remote-tracking branch 'origin/master' into cgal
Former-commit-id: 5aa1360ab8
2018-02-16 20:17:42 -05:00
Jérémie Dumas dd5f7441be Working on getting boost external project to work.
Former-commit-id: e369e54656
2018-02-16 20:14:20 -05:00
Alec Jacobson 54953fe376 merge
Former-commit-id: 1798003120
2018-02-14 21:38:34 -05:00
Jérémie Dumas 30076a3a6d Boost why U keep failing.
Former-commit-id: dd1bf2583a
2018-02-13 17:20:51 -05:00
Jérémie Dumas d0237cc1e0 Boost attempt 12974.
Former-commit-id: 0e7c36165f
2018-02-13 14:24:09 -05:00
Jérémie Dumas a9c5f84e8a Grrr Boost.
Former-commit-id: c80bca2e53
2018-02-13 14:02:49 -05:00
Jérémie Dumas a198223dcd Grrr Boost.
Former-commit-id: 9d0aa37229
2018-02-13 13:46:42 -05:00
Jérémie Dumas 9e1aacc0ae Try setting env variable.
Former-commit-id: 163a7cd835
2018-02-13 13:18:10 -05:00
Jérémie Dumas 989a255604 Try to set Boost root.
Former-commit-id: 0b67fe2be5
2018-02-13 12:31:01 -05:00
Jérémie Dumas 4a4b6d96dd Update multi-mesh tutorial + drop opengl2/ from CMake.
Former-commit-id: ce9fa48f5d
2018-02-10 19:57:45 -05:00
Jérémie Dumas 8155326141 Update ViewerMenu tutorial with ImGui.
Former-commit-id: 519297bd28
2018-02-10 18:30:21 -05:00
Jérémie Dumas 0448a3e3b6 Transition OpenGL loader to glad.
Former-commit-id: fe6520dab5
2018-02-10 16:11:09 -05:00
Alec Jacobson 134a7bb8ba Fix CMake that was overwriting desired options when not found
Former-commit-id: 321343d402
2018-02-08 10:40:53 -05:00
Daniele Panozzo 9080378e27 - viewerdata and meshgl are merged
- meshgl objects are automatically initialized (but manually freed)
- moved the data->meshgl conversion inside viewerdata to keep meshgl generic


Former-commit-id: dc226a5810
2018-02-04 17:48:07 -05:00
Daniele Panozzo 0a18442c6b 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


Former-commit-id: 8d2967ebdc
2018-02-03 20:15:02 -05:00
Alec Jacobson b000fd7bb7 Merge branch 'master' of github.com:libigl/libigl into alecjacobson
Former-commit-id: 9a805a9764
2018-01-30 10:06:43 -05:00
Alec Jacobson 299a0f7591 capitalization matters
Former-commit-id: 5e29bdad94
2018-01-28 12:06:54 -05:00
Alec Jacobson b546aa5220 matlab is a built in module for cmake, use defaults instead
Former-commit-id: 10700868a8
2018-01-25 14:30:32 -05:00
Unknown 2ddb11aa6b 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

Former-commit-id: dc31807ff5
2018-01-14 06:07:31 -05:00
Alec Jacobson e63b431498 merge
Former-commit-id: a8f5ca98ee
2017-12-18 08:20:12 -05:00
Alec Jacobson eed7bd0ff2 Fix bug in new cmake file, cgal overwriting cmake flags
Former-commit-id: fb45c43f72
2017-12-03 10:25:12 +07:00
Jérémie Dumas 1620b0f425 Update libigl.cmake
Former-commit-id: 20c2792aa8
2017-11-17 20:56:52 -05:00
gaoxifeng bb4ed6978f fixed libigl.cmake for linux
Former-commit-id: f41a74321d
2017-11-17 18:10:15 -05:00
Alec Jacobson 73d1b1d85c merge
Former-commit-id: b257703097
2017-11-15 15:51:21 -05:00
Jérémie Dumas 5219d786f8 Try to adapt CGAL external project for Windows.
Former-commit-id: ee02dfaa76
2017-11-04 13:00:02 -04:00
Jérémie Dumas 0bd50a36ca Experimenting with CGAL as an external CMake project.
Former-commit-id: 3c86ad133c
2017-11-04 10:14:17 -04:00
Jérémie Dumas ecc199fe3b Copy lib files only if it is a DLL.
Former-commit-id: 56be2e0c58
2017-11-03 21:22:41 -04:00
Jérémie Dumas a6d78b7141 Fix CGAL include paths on Windows when CGAL is installed outside its source directory.
Former-commit-id: f61c0d5271
2017-11-03 21:07:08 -04:00
Jérémie Dumas 10f860d563 Check that input dll exists before copying it.
Former-commit-id: 1d42c858a6
2017-11-03 19:38:30 -04:00
Jérémie Dumas f787dcc330 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.


Former-commit-id: 7bce35d70c
2017-11-03 18:36:21 -04:00
gaoxifeng 9a371b84af updated libigl.cmake
Former-commit-id: 9fc184f64b
2017-11-03 03:02:36 -04:00
Jérémie Dumas bc29ba643b Minor fixes in CMake build script.
Former-commit-id: 2d6ee9a017
2017-10-29 16:39:04 -04:00