Skip to content

Commit dc8fb5f

Browse files
committed
Still testing windows issue with wxwidgets
1 parent 913a859 commit dc8fb5f

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,14 @@ if (UNIX)
143143
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base )
144144
endif()
145145
else()
146-
set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
147-
message(STATUS "wxWidgets directory ${wxWidgets_ROOT_DIR}")
148-
find_package(wxWidgets REQUIRED xrc webview stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
146+
set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
147+
find_package(wxWidgets QUIET REQUIRED xrc stc richtext ribbon propgrid aui gl html qa adv core xml net base scintilla)
149148
endif()
150149

151-
include(${wxWidgets_USE_FILE})
150+
if (wxWidgets_FOUND)
151+
include(${wxWidgets_USE_FILE})
152+
endif ()
153+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
152154

153155

154156
#####################################################################################################################

0 commit comments

Comments
 (0)