Przeglądaj źródła

Merge branch 'dev' of https://github.com/libigl/libigl into fix-is_irregular_vertex

Nico Brügel 6 lat temu
rodzic
commit
7361a30ecb
2 zmienionych plików z 9 dodań i 1 usunięć
  1. 8 0
      cmake/libigl-cgal.yml
  2. 1 1
      include/igl/deprecated.h

+ 8 - 0
cmake/libigl-cgal.yml

@@ -0,0 +1,8 @@
+# This is a conda environment that can be used to compile libigl with CGAL on Windows
+# Only boost is required to be installed on the system, CGAL is automatically downloaded
+# by CMake and is built with libigl.
+name: libigl-cgal
+channels:
+  - conda-forge
+dependencies:
+  - boost-cpp=1.65.0

+ 1 - 1
include/igl/deprecated.h

@@ -10,7 +10,7 @@
 // Macro for marking a function as deprecated.
 // 
 // http://stackoverflow.com/a/295229/148668
-#ifdef __GNUC__
+#if defined(__GNUC__) || defined(__clang__)
 #define IGL_DEPRECATED(func) func __attribute__ ((deprecated))
 #elif defined(_MSC_VER)
 #define IGL_DEPRECATED(func) __declspec(deprecated) func