Skip to content
Snippets Groups Projects
Commit 296dd75f authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

ANN is now useful even without Mesh or Plugin modules

parent 09ce6880
Branches
Tags
No related merge requests found
Pipeline #2378 canceled
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 13 additions and 15 deletions
CMakeLists.txt
+ 13
− 15
View file @ 296dd75f
...@@ -705,7 +705,6 @@ if(HAVE_FLTK OR ENABLE_GRAPHICS) ...@@ -705,7 +705,6 @@ if(HAVE_FLTK OR ENABLE_GRAPHICS)
endif(OPENGL_GLU_FOUND AND OPENGL_FOUND) endif(OPENGL_GLU_FOUND AND OPENGL_FOUND)
endif(HAVE_FLTK OR ENABLE_GRAPHICS) endif(HAVE_FLTK OR ENABLE_GRAPHICS)
if(HAVE_MESH OR HAVE_PLUGINS)
if(ENABLE_ANN) if(ENABLE_ANN)
find_library(ANN_LIB ann PATH_SUFFIXES lib) find_library(ANN_LIB ann PATH_SUFFIXES lib)
find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN) find_path(ANN_INC "ANN.h" PATH_SUFFIXES src include ANN)
...@@ -719,7 +718,6 @@ if(HAVE_MESH OR HAVE_PLUGINS) ...@@ -719,7 +718,6 @@ if(HAVE_MESH OR HAVE_PLUGINS)
endif(ENABLE_SYSTEM_CONTRIB AND ANN_LIB AND ANN_INC) endif(ENABLE_SYSTEM_CONTRIB AND ANN_LIB AND ANN_INC)
set_config_option(HAVE_ANN "Ann") set_config_option(HAVE_ANN "Ann")
endif(ENABLE_ANN) endif(ENABLE_ANN)
endif(HAVE_MESH OR HAVE_PLUGINS)
if(ENABLE_BFGS) if(ENABLE_BFGS)
add_subdirectory(contrib/lbfgs) add_subdirectory(contrib/lbfgs)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment