3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New parameter DEP_WX_GTK3=on/off to build wxWidgets against GTK3.

Browse Source
This commit is contained in:
Vojtech Bubnik 2020-04-02 11:42:45 +02:00
parent a6fe16c612
commit b578b7ec87
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/CMakeLists.txt vendored
View File

@ -35,6 +35,7 @@ set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination direct
option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON) option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON)
option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF) option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF)
option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF)
# On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL. # On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL.
# FIXME: # FIXME:

8
deps/deps-linux.cmake vendored
View File

@ -99,6 +99,12 @@ else ()
set(DEP_WX_TAG "v3.1.1-patched") set(DEP_WX_TAG "v3.1.1-patched")
endif() endif()
if (DEP_WX_GTK3)
set(WX_GTK_VERSION "3")
else ()
set(WX_GTK_VERSION "2")
endif()
ExternalProject_Add(dep_wxwidgets ExternalProject_Add(dep_wxwidgets
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets" GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
@ -108,7 +114,7 @@ ExternalProject_Add(dep_wxwidgets
CONFIGURE_COMMAND ./configure CONFIGURE_COMMAND ./configure
"--prefix=${DESTDIR}/usr/local" "--prefix=${DESTDIR}/usr/local"
--disable-shared --disable-shared
--with-gtk=2 --with-gtk=${WX_GTK_VERSION}
--with-opengl --with-opengl
--enable-unicode --enable-unicode
--enable-graphics_ctx --enable-graphics_ctx