mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:Add FLATPAK variable to skip installing FFmpeg 

GITHUB: #5008
Change-Id: Id4e9637f13580bda4c74197ca302c7f5f8ad5a25
This commit is contained in:
Mack 2024-10-21 15:04:59 +08:00 committed by Lane.Wei
parent a325e7156b
commit 1433ef6edc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -42,6 +42,8 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
set(IS_CROSS_COMPILE FALSE) set(IS_CROSS_COMPILE FALSE)
set(FLATPAK FALSE CACHE BOOL "Not copy FFMPEG file")
if (APPLE) if (APPLE)
set(CMAKE_FIND_FRAMEWORK LAST) set(CMAKE_FIND_FRAMEWORK LAST)
@ -760,7 +762,7 @@ else ()
install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources") install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
endif () endif ()
if (CMAKE_SYSTEM_NAME STREQUAL "Linux") if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT FLATPAK)
set(LIBRARY_FILES set(LIBRARY_FILES
${LIBDIR_BIN}/libavcodec.so.61 ${LIBDIR_BIN}/libavcodec.so.61
${LIBDIR_BIN}/libavcodec.so.61.3.100 ${LIBDIR_BIN}/libavcodec.so.61.3.100

2
src/CMakeLists.txt
View File

@ -218,7 +218,7 @@ if (WIN32)
else () else ()
if (NOT APPLE) if (NOT APPLE AND NOT FLATPAK)
set(output_sos_Release "") set(output_sos_Release "")
set(output_sos_Debug "") set(output_sos_Debug "")
add_custom_target(BambuStudioSosCopy ALL DEPENDS BambuStudio) add_custom_target(BambuStudioSosCopy ALL DEPENDS BambuStudio)