From 7f578ce1aecd936f56053bebf901ade35e33b2d3 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 4 Dec 2011 03:59:42 +0100 Subject: [PATCH] Use Externals/wxWidgets3 instead of Externals/wxWidgets under OS X. The "3" variant has some extra stuff merged that helps under OS X. This split should not last longer than until the wxWidgets 3.0 release. --- CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3648c82e52..1e13aef68b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -433,8 +433,15 @@ if(NOT DISABLE_WX) message(FATAL_ERROR "wxWidgets not found. It is required to build the GUI") endif() message("Shared wxWidgets not found, falling back to the static library") - include_directories(Externals/wxWidgets/include) - add_subdirectory(Externals/wxWidgets) + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + add_definitions(-D__WXOSX_COCOA__) + include_directories(Externals/wxWidgets3) + include_directories(Externals/wxWidgets3/include) + add_subdirectory(Externals/wxWidgets3) + else() + include_directories(Externals/wxWidgets/include) + add_subdirectory(Externals/wxWidgets) + endif() endif(wxWidgets_FOUND) add_definitions(-DHAVE_WX=1) endif(NOT DISABLE_WX)