From a5c12b3afc7c4383262f7131e2fb6ae5d6b455a5 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Mon, 2 Apr 2012 16:45:13 +0000 Subject: [PATCH] --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e6658a675..ff57b145fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ project(gmsh CXX C) # e.g. "cmake -DDEFAULT=0 -DENABLE_POST=1 -DENABLE_PARSER=1") set(DEFAULT ON CACHE INTERNAL "Default value for enabled-by-default options") +option(ENABLE_3M "Enable 3M" OFF) option(ENABLE_ACIS "Enable ACIS geometrical models" ${DEFAULT}) option(ENABLE_ANN "Enable ANN to compute Approximate Nearest Neighbors" ${DEFAULT}) option(ENABLE_APP_BUNDLE "Create .app bundle on Mac when installing" ${DEFAULT}) @@ -456,11 +457,11 @@ if(HAVE_FLTK OR HAVE_QT OR ENABLE_GRAPHICS) set_config_option(HAVE_MPEG_ENCODE "Mpeg") endif(ENABLE_MPEG_ENCODE) - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M) + if(ENABLE_3M AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M) add_subdirectory(contrib/3M) include_directories(contrib/3M) set_config_option(HAVE_3M "3M") - endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M) + endif(ENABLE_3M AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/3M) if(ENABLE_OSMESA) find_library(OSMESA_LIB OSMesa) -- GitLab