OR Tools

CMakeLists.txt

@@ -69,17 +69,20 @@ endif ()
 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 REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
+#    set(CMAKE_MAP_IMPORTED_CONFIG_DEBUG Release)
+    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})
+if (wxWidgets_FOUND)
+    include(${wxWidgets_USE_FILE})
+endif ()
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
 
 if (UNIX AND NOT APPLE)

src/dview/dvfilereader.cpp

@@ -1013,7 +1013,7 @@ bool wxDVFileReader::ReadSQLFile(wxDVPlotCtrl *plotWin, const wxString &filename
                 dictionaryIndex = sqlite3_column_int(sqlStmtPtr, 0);
                 name = ColumnText(sqlite3_column_text(sqlStmtPtr, 1));
                 keyValue = ColumnText(sqlite3_column_text(sqlStmtPtr, 2)).length() ? ColumnText(
-                        sqlite3_column_text(sqlStmtPtr, 2)) : "Site";
+                        sqlite3_column_text(sqlStmtPtr, 2)) : wxString("Site");
                 rf = ColumnText(sqlite3_column_text(sqlStmtPtr, 3));
                 units = ColumnText(sqlite3_column_text(sqlStmtPtr, 4));
 

src/ole/iehtmlwin.cpp

@@ -120,7 +120,7 @@ void wxIEHtmlWin::SetupBrowser() {
     m_webBrowser->put_RegisterAsBrowser(VARIANT_TRUE);
     m_webBrowser->put_RegisterAsDropTarget(VARIANT_TRUE);
 
-    m_webBrowser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);
+    m_webBrowser->Navigate((BSTR)"about:blank", NULL, NULL, NULL, NULL);
 }
 
 

src/registration.cpp

@@ -289,7 +289,7 @@ END_EVENT_TABLE()
 
 wxOnlineRegistration::wxOnlineRegistration(wxWindow *parent)
         : wxDialog(parent, wxID_ANY,
-                   gs_regData ? gs_regData->GetAppName() + " Registration" : "Software Registration",
+                   gs_regData ? gs_regData->GetAppName() + wxString(" Registration") : wxString("Software Registration"),
                    wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) {
     wxFont font(wxMetroTheme::Font(wxMT_LIGHT, 12));
     SetBackgroundColour(wxMetroTheme::Colour(wxMT_FOREGROUND));

tools/CMakeLists.txt

@@ -90,6 +90,13 @@ else ()
         target_link_libraries(wexsandbox optimized ${LK_LIB})
     endif()
 endif ()
+
+if (wxWidgets_FOUND)
+    include(${wxWidgets_USE_FILE})
+endif ()
+add_compile_options(${wxWidgets_CXX_FLAGS})
+add_definitions(-DLK_USE_WXWIDGETS )
+
 if (UNIX AND NOT APPLE)
     target_link_libraries(wexsandbox wex ${wxWidgets_LIBRARIES} ${FONTCONFIG_LIBRARY})
 else ()