Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: deps/wxWidgets: Fix BambuStudio linking #3278

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ if (NOT CURL_FOUND)
set(CURL_PKG dep_CURL)
endif ()

include(NanoSVG/NanoSVG.cmake)
include(JPEG/JPEG.cmake)
include(TIFF/TIFF.cmake)
include(wxWidgets/wxWidgets.cmake)
Expand All @@ -198,6 +199,7 @@ set(_dep_list
dep_Boost
dep_TBB
${CURL_PKG}
dep_NanoSVG
dep_wxWidgets
dep_Cereal
dep_NLopt
Expand Down
4 changes: 4 additions & 0 deletions deps/NanoSVG/NanoSVG.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
bambustudio_add_cmake_project(NanoSVG
URL https://github.com/memononen/nanosvg/archive/93ce879dc4c04a3ef1758428ec80083c38610b1f.zip
URL_HASH SHA256=2e6aff9a8e6794d29c8491f99362494df0fd090ae13450904cd1c24cf5fdfec6
)
4 changes: 3 additions & 1 deletion deps/wxWidgets/wxWidgets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ bambustudio_add_cmake_project(wxWidgets
GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
GIT_TAG ${_wx_git_tag}
PATCH_COMMAND ${_patch_cmd}
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG dep_NanoSVG
CMAKE_ARGS
-DwxBUILD_PRECOMP=ON
${_wx_toolkit}
Expand All @@ -55,6 +55,8 @@ bambustudio_add_cmake_project(wxWidgets
-DwxUSE_LIBJPEG=sys
-DwxUSE_LIBTIFF=sys
-DwxUSE_EXPAT=sys
-DwxUSE_NANOSVG=sys
-DwxUSE_NANOSVG_EXTERNAL=ON
)

if (MSVC)
Expand Down
1 change: 0 additions & 1 deletion src/nanosvg/README.txt

This file was deleted.

Loading
Loading