From 962ea9a017100d35b85525e7ad21251bd152a225 Mon Sep 17 00:00:00 2001 From: Thomas De Maet <thomas.demaet@uclouvain.be> Date: Fri, 4 Mar 2011 08:14:56 +0000 Subject: [PATCH] changing LUA/SWIG stuff in makeList and other small mods --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10e9d19f03..7896e64dc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ option(ENABLE_FOURIER_MODEL "Enable Fourier geometrical models" OFF) option(ENABLE_GMM "Enable GMM linear algebra solvers" ON) option(ENABLE_GRAPHICS "Compile-in OpenGL graphics even if there is no GUI" OFF) option(ENABLE_KBIPACK "Enable Kbipack for homology solver" ON) -option(ENABLE_LUA "Enable the Programming Language Lua " ON) +option(ENABLE_LUA "Enable the Programming Language Lua (deprecated)" OFF) option(ENABLE_MATCH "Enable Minimum cost perfect matching algo" ON) option(ENABLE_MATHEX "Enable MathEx expression parser" ON) option(ENABLE_MED "Enable MED mesh and post-processing file formats" ON) @@ -50,7 +50,7 @@ option(ENABLE_QT "Build QT GUI" OFF) option(ENABLE_READLINE "Enable Readline in Lua prompt" ON) option(ENABLE_SLEPC "Enable SLEPc eigensolvers" ON) option(ENABLE_SOLVER "Enable solver components" ON) -option(ENABLE_SWIG_EXPERIMENTAL "Enable swig (in developement, totally unusable)" OFF) +option(ENABLE_SWIG "Enable swig" ON) option(ENABLE_TAUCS "Enable Taucs linear algebra solver" ON) option(ENABLE_TETGEN "Enable Tetgen mesh generator" ON) option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF) @@ -1131,7 +1131,7 @@ mark_as_advanced(BISON FLEX GMP_LIB GMSH_EXTRA_VERSION HDF5_LIB MAKEINFO MED_LIB OCC_INC SZ_LIB TAUCS_LIB LUA_LIB ACIS_LIB TEXI2PDF READLINE_LIB) -if(ENABLE_SWIG_EXPERIMENTAL) +if(ENABLE_SWIG) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) FIND_PACKAGE(PythonLibs) @@ -1139,4 +1139,4 @@ if(ENABLE_SWIG_EXPERIMENTAL) SET_SOURCE_FILES_PROPERTIES(Common/gmshpy.i PROPERTIES CPLUSPLUS ON) SWIG_ADD_MODULE(gmshpy python Common/gmshpy.i) SWIG_LINK_LIBRARIES(gmshpy ${PYTHON_LIBRARIES} ${EXTERNAL_LIBRARIES} ${LINK_LIBRARIES} shared) -endif(ENABLE_SWIG_EXPERIMENTAL) +endif(ENABLE_SWIG) -- GitLab