diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:33:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 08:36:19 +0400 |
commit | 2b4c68b902b261127f7deabf922048c41be6fb55 (patch) | |
tree | 1c40311a6c8e13ea4754fc692283b11cafdb8bea /source/blender/bmesh | |
parent | 295116ea6b3a81a6c7b84d8a9d21288108c5f19e (diff) |
CMake Build: option to compile without opennl/superlu.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_smooth_laplacian.c | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index b80a10b43fe..afb8b07b1a6 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -31,7 +31,6 @@ set(INC ../makesdna ../../../intern/guardedalloc ../../../extern/rangetree - ../../../intern/opennl/extern ) set(INC_SYS @@ -160,6 +159,13 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_OPENNL) + add_definitions(-DWITH_OPENNL) + list(APPEND INC_SYS + ../../../intern/opennl/extern + ) +endif() + if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 3f04e23aa73..16e70e8c155 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -34,10 +34,12 @@ #include "bmesh.h" -#include "ONL_opennl.h" - #include "intern/bmesh_operators_private.h" /* own include */ +#ifdef WITH_OPENNL + +#include "ONL_opennl.h" + // #define SMOOTH_LAPLACIAN_AREA_FACTOR 4.0f /* UNUSED */ // #define SMOOTH_LAPLACIAN_EDGE_FACTOR 2.0f /* UNUSED */ #define SMOOTH_LAPLACIAN_MAX_EDGE_PERCENTAGE 1.8f @@ -572,3 +574,13 @@ void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op) delete_laplacian_system(sys); } + +#else /* WITH_OPENNL */ + +#ifdef __GNUC__ +# pragma GCC diagnostic ignored "-Wunused-parameter" +#endif + +void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op) {} + +#endif /* WITH_OPENNL */ |