pp

CMakeLists.txt

@@ -668,20 +668,18 @@ if(ENABLE_OSMESA)
   endif(OSMESA_LIB)
 endif(ENABLE_OSMESA)
 
-if(HAVE_LUA)
-  if(ENABLE_READLINE)
-    find_library(READLINE_LIB readline PATH_SUFFIXES lib)
-    if(READLINE_LIB)
-      find_path(READLINE_INC "readline.h" PATH_SUFFIXES src readline include)
-      if(READLINE_INC)
-        set(HAVE_READLINE TRUE)
-        list(APPEND CONFIG_OPTIONS "Readline")
-        list(APPEND EXTERNAL_LIBRARIES ${READLINE_LIB})
-        list(APPEND EXTERNAL_INCLUDES ${READLINE_INC})
-      endif(READLINE_INC)
-    endif(READLINE_LIB)
-  endif(ENABLE_READLINE)
-endif(HAVE_LUA)
+if(HAVE_LUA AND ENABLE_READLINE)
+  find_library(READLINE_LIB readline PATH_SUFFIXES lib)
+  if(READLINE_LIB)
+    find_path(READLINE_INC "readline.h" PATH_SUFFIXES src readline include)
+    if(READLINE_INC)
+      set(HAVE_READLINE TRUE)
+      list(APPEND CONFIG_OPTIONS "Readline")
+      list(APPEND EXTERNAL_LIBRARIES ${READLINE_LIB})
+      list(APPEND EXTERNAL_INCLUDES ${READLINE_INC})
+    endif(READLINE_INC)
+  endif(READLINE_LIB)
+endif(HAVE_LUA AND ENABLE_READLINE)
 
 include(CheckFunctionExists)
 check_function_exists(vsnprintf HAVE_VSNPRINTF)
@@ -704,6 +702,7 @@ endif(NOT SOCKLEN_T_SIZE)
 set(CMAKE_EXTRA_INCLUDE_FILES)
 
 if(UNIX)
+  # do not optimize some files on Unix
   file(GLOB_RECURSE NON_OPTIMIZED_SRC Common/GmshPredicates.cpp Mesh/BDS.cpp
        Parser/Gmsh.tab.cpp contrib/Tetgen*/*.cxx)
   set_source_files_properties(${NON_OPTIMIZED_SRC} COMPILE_FLAGS "-O0")

Fltk/FlGui.cpp

@@ -231,7 +231,7 @@ FlGui::FlGui(int argc, char **argv)
                                         gmsh32x32, 32, 32));
   menu->win->icon
     ((const char*)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
-    gmsh32x32, 32, 32));
+                                        gmsh32x32, 32, 32));
 #endif
 
   // open graphic window first for correct non-modal behaviour on