From c97064fcd7fa165775f097662251f83bbea1830e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 25 Jan 2010 08:58:41 +0000
Subject: [PATCH] pp
---
CMakeLists.txt | 27 +++++++++++++--------------
Fltk/FlGui.cpp | 2 +-
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4affc3c33a..d15cde5fa5 100644
--- a/CMakeLists.txt
+++ b/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")
diff --git a/Fltk/FlGui.cpp b/Fltk/FlGui.cpp
index 378fe0c4a0..de9c4529e4 100644
--- a/Fltk/FlGui.cpp
+++ b/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
--
GitLab