From 0bba784acc13c5b0849fc23468e89576e9ed2222 Mon Sep 17 00:00:00 2001
From: Yi Zhang <zhangyiss@icloud.com>
Date: Wed, 25 Aug 2021 17:17:47 +0800
Subject: [PATCH] update cmakelists and gm3d_gui

---
 src/CMakeLists.txt |  8 ++++----
 src/gm3d_gui.cpp   | 25 +++++++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 446fca2..e43e350 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,7 @@
 aux_source_directory(. DIR_SRC)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
-
-include_directories(/usr/local/include)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -O2")
 
 # NOTE: Don't include the path in MACOSX_BUNDLE_ICON_FILE -- this is
 # the property added to Info.plist
@@ -32,8 +31,9 @@ endif()
 #find_library(FLTK_LIBRARY libfltk.a /usr/local/Cellar/fltk/1.3.5/lib)
 
 # 添加头文件地址
-include_directories(/usr/include)
+include_directories(/opt/homebrew/include)
+include_directories(/usr/local/include)
 # 添加动态库地址
-find_library(FLTK_LIBRARY fltk HINTS /usr/local/lib)
+find_library(FLTK_LIBRARY fltk HINTS /opt/homebrew/lib)
 
 target_link_libraries(gm3d ${FLTK_LIBRARY} OpenMP::OpenMP_CXX)
\ No newline at end of file
diff --git a/src/gm3d_gui.cpp b/src/gm3d_gui.cpp
index 528cff3..2ff4c9e 100644
--- a/src/gm3d_gui.cpp
+++ b/src/gm3d_gui.cpp
@@ -82,8 +82,9 @@ void cb_mesh_file_btn(Fl_Widget*, void*){
 
     std::stringstream temp_ss;
     temp_ss << abs_filename.substr(pos+1);
-    const char* disp_filename = temp_ss.str().c_str();
-    mesh_para_output->value(disp_filename);
+    //const char* disp_filename = temp_ss.str().c_str();
+    //mesh_para_output->value(disp_filename);
+    mesh_para_output->value(temp_ss.str().c_str());
   }
   else
   {
@@ -282,8 +283,9 @@ void cb_mod_file_out_btn(Fl_Widget*, void*){
 
     std::stringstream temp_ss;
     temp_ss << abs_filename.substr(pos+1);
-    const char* disp_filename = temp_ss.str().c_str();
-    mod_out_file_output->value(disp_filename);
+    //const char* disp_filename = temp_ss.str().c_str();
+    //mod_out_file_output->value(disp_filename);
+    mod_out_file_output->value(temp_ss.str().c_str());
   }
   else
   {
@@ -377,8 +379,9 @@ void cb_mod_file_btn(Fl_Widget*, void*){
 
     std::stringstream temp_ss;
     temp_ss << abs_filename.substr(pos+1);
-    const char* disp_filename = temp_ss.str().c_str();
-    mod_file_output->value(disp_filename);
+    //const char* disp_filename = temp_ss.str().c_str();
+    //mod_file_output->value(disp_filename);
+    mod_file_output->value(temp_ss.str().c_str());
   }
   else
   {
@@ -412,8 +415,9 @@ void cb_obs_file_btn(Fl_Widget*, void*){
 
     std::stringstream temp_ss;
     temp_ss << abs_filename.substr(pos+1);
-    const char* disp_filename = temp_ss.str().c_str();
-    obs_file_output->value(disp_filename);
+    //const char* disp_filename = temp_ss.str().c_str();
+    //obs_file_output->value(disp_filename);
+    obs_file_output->value(temp_ss.str().c_str());
   }
   else
   {
@@ -447,8 +451,9 @@ void cb_res_file_btn(Fl_Widget*, void*){
 
     std::stringstream temp_ss;
     temp_ss << abs_filename.substr(pos+1);
-    const char* disp_filename = temp_ss.str().c_str();
-    res_file_output->value(disp_filename);
+    //const char* disp_filename = temp_ss.str().c_str();
+    //res_file_output->value(disp_filename);
+    res_file_output->value(temp_ss.str().c_str());
   }
   else
   {