GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-11 06:48:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for win deps builds

Browse Source
This commit is contained in:
tamasmeszaros 2023-10-27 13:50:36 +02:00
parent d014ecfae7
commit e316f1c9e8
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,3 +21,4 @@ deps/build-linux/*
**/.DS_Store **/.DS_Store
**/.idea/ **/.idea/
.pkg_cache .pkg_cache
CMakeUserPresets.json

3
cmake/modules/AddCMakeProject.cmake
View File

@ -50,12 +50,13 @@ function(add_cmake_project projectname)
set(_verbose_switch "-v:d") set(_verbose_switch "-v:d")
endif () endif ()
endif () endif ()
ExternalProject_Add( ExternalProject_Add(
dep_${projectname} dep_${projectname}
EXCLUDE_FROM_ALL ON # Not built by default, dep_${projectname} needs to be added to ALL target EXCLUDE_FROM_ALL ON # Not built by default, dep_${projectname} needs to be added to ALL target
INSTALL_DIR ${${PROJECT_NAME}_DEP_INSTALL_PREFIX} INSTALL_DIR ${${PROJECT_NAME}_DEP_INSTALL_PREFIX}
DOWNLOAD_DIR ${${PROJECT_NAME}_DEP_DOWNLOAD_DIR}/${projectname} DOWNLOAD_DIR ${${PROJECT_NAME}_DEP_DOWNLOAD_DIR}/${projectname}
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/builds/${projectname}
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:STRING=${${PROJECT_NAME}_DEP_INSTALL_PREFIX} -DCMAKE_INSTALL_PREFIX:STRING=${${PROJECT_NAME}_DEP_INSTALL_PREFIX}
-DCMAKE_MODULE_PATH:STRING=${CMAKE_MODULE_PATH} -DCMAKE_MODULE_PATH:STRING=${CMAKE_MODULE_PATH}

4
deps/+Boost/Boost.cmake vendored
View File

@ -11,8 +11,8 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
endif () endif ()
add_cmake_project(Boost add_cmake_project(Boost
URL "https://github.com/boostorg/boost/releases/download/boost-1.82.0/boost-1.82.0.zip" URL "https://github.com/boostorg/boost/releases/download/boost-1.83.0/boost-1.83.0.zip"
URL_HASH SHA256=200f9292b5ef957ab551a648834239f502df165cb7bff18432702fb7ae98accb URL_HASH SHA256=9effa3d7f9d92b8e33e2b41d82f4358f97ff7c588d5918720339f2b254d914c6
LIST_SEPARATOR | LIST_SEPARATOR |
CMAKE_ARGS CMAKE_ARGS
-DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test -DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test

2
deps/CMakeLists.txt vendored
View File

@ -246,7 +246,7 @@ if (DEP_DEBUG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
endforeach() endforeach()
# Create a subdirectory for the Debug build within the current binary dir: # Create a subdirectory for the Debug build within the current binary dir:
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/DebugBuild) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_d)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -G${CMAKE_GENERATOR} COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -G${CMAKE_GENERATOR}
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug