Merge branch 'ortools_build' into ortool__full_release

Author: qualand

CMakeLists.txt

@@ -134,13 +134,13 @@ if (UNIX)
     endif ()
 
     if (APPLE)
-        find_package(wxWidgets REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base )
+        find_package(wxWidgets  QUIET REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base )
     else()
-	    find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base )
+	    find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base )
     endif()
-else()
-	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-	find_package(wxWidgets REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+#else()
+#	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#	find_package(wxWidgets QUIET  REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
 endif()
 
 include(${wxWidgets_USE_FILE})
@@ -411,5 +411,17 @@ else()
         COMMAND ${CMAKE_COMMAND}
         ARGS -E copy $ENV{SSCDIR}/ssc/sscapi.h ${CMAKE_CURRENT_SOURCE_DIR}/deploy/runtime
     )
+
+    file(GLOB ORTOOLS_DLLS "$ENV{ORTOOLSDIR}/bin/*.dll")
+    foreach( file_i ${ORTOOLS_DLLS})
+        add_custom_command(
+        TARGET ${SAM_EXE}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        ARGS -E copy ${file_i} ${SAMEXE_DIR}
+    )
+    endforeach( file_i )
+
+
 endif()
 

api/api_autogen/CMakeLists.txt

@@ -64,14 +64,14 @@ add_compile_definitions( LK_USE_WXWIDGETS )
 if (UNIX)
     if (EXISTS /usr/local/bin/wx-config-3)
         set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
-        find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
+        find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
     else ()
         set(wxWidgets_CONFIG_EXECUTABLE $ENV{WXMSW3}/bin/wx-config)
-        find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
+        find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
     endif ()
-else()
-    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-    find_package(wxWidgets COMPONENTS qa webview aui richtext html propgrid adv net stc core base scintilla REQUIRED)
+#else()
+#    set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#    find_package(wxWidgets QUIET  COMPONENTS qa webview aui richtext html propgrid adv net stc core base scintilla REQUIRED)
 endif()
 
 include(${wxWidgets_USE_FILE})

api/api_autogen/builder_generator_helper.cpp

@@ -198,7 +198,7 @@ std::string ssc_value_to_json(int ssc_type, VarValue* vv){
             json += "\"invalid\"";
             break;
         case SSC_STRING:
-            json += "\"" + (vv? vv->AsString() : "" ) + "\"";
+            json += "\"" + (vv? vv->AsString() : wxString("") ) + "\"";
             break;
         case SSC_NUMBER:
             if (vv && vv->Value() > std::numeric_limits<double>::max()){
@@ -207,7 +207,7 @@ std::string ssc_value_to_json(int ssc_type, VarValue* vv){
                 json += c;
             }
             else
-                json += (vv? vv->AsString() : "0" );
+                json += (vv? vv->AsString() : wxString("0") );
             break;
         case SSC_ARRAY:
             json += "[";

api/api_autogen/config_extractor.cpp

@@ -114,7 +114,7 @@ size_t config_extractor::load_variables_into_graph(VarTable &vt) {
     else{
         wxArrayString cmod_names = vt.ListAll(nullptr);
         for (size_t j = 0; j < cmod_names.size(); j++) {
-            std::string cmod_symbol = cmod_names[j];
+            std::string cmod_symbol = cmod_names[j].ToStdString();
             auto vtt = vt.Get(cmod_symbol)->Table();
             wxArrayString var_names = vtt.ListAll(nullptr);
             for (size_t i = 0; i < var_names.size(); i++){

test/CMakeLists.txt

@@ -77,10 +77,10 @@ add_definitions(-DLK_USE_WXWIDGETS )
 # setup wxWidgets
 if (UNIX)
 	set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
-	find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
-else()
-	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-	find_package(wxWidgets REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+	find_package(wxWidgets  QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base)
+#else()
+#	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+#	find_package(wxWidgets QUIET  REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
 endif()
 
 include(${wxWidgets_USE_FILE})