mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-11 06:48:58 +08:00
Fixes for win deps builds
This commit is contained in:
parent
d014ecfae7
commit
e316f1c9e8
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@ deps/build-linux/*
|
||||
**/.DS_Store
|
||||
**/.idea/
|
||||
.pkg_cache
|
||||
CMakeUserPresets.json
|
||||
|
@ -56,6 +56,7 @@ function(add_cmake_project projectname)
|
||||
EXCLUDE_FROM_ALL ON # Not built by default, dep_${projectname} needs to be added to ALL target
|
||||
INSTALL_DIR ${${PROJECT_NAME}_DEP_INSTALL_PREFIX}
|
||||
DOWNLOAD_DIR ${${PROJECT_NAME}_DEP_DOWNLOAD_DIR}/${projectname}
|
||||
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/builds/${projectname}
|
||||
CMAKE_ARGS
|
||||
-DCMAKE_INSTALL_PREFIX:STRING=${${PROJECT_NAME}_DEP_INSTALL_PREFIX}
|
||||
-DCMAKE_MODULE_PATH:STRING=${CMAKE_MODULE_PATH}
|
||||
|
4
deps/+Boost/Boost.cmake
vendored
4
deps/+Boost/Boost.cmake
vendored
@ -11,8 +11,8 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES)
|
||||
endif ()
|
||||
|
||||
add_cmake_project(Boost
|
||||
URL "https://github.com/boostorg/boost/releases/download/boost-1.82.0/boost-1.82.0.zip"
|
||||
URL_HASH SHA256=200f9292b5ef957ab551a648834239f502df165cb7bff18432702fb7ae98accb
|
||||
URL "https://github.com/boostorg/boost/releases/download/boost-1.83.0/boost-1.83.0.zip"
|
||||
URL_HASH SHA256=9effa3d7f9d92b8e33e2b41d82f4358f97ff7c588d5918720339f2b254d914c6
|
||||
LIST_SEPARATOR |
|
||||
CMAKE_ARGS
|
||||
-DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
|
||||
|
2
deps/CMakeLists.txt
vendored
2
deps/CMakeLists.txt
vendored
@ -246,7 +246,7 @@ if (DEP_DEBUG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
endforeach()
|
||||
|
||||
# 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(
|
||||
COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -G${CMAKE_GENERATOR}
|
||||
-DCMAKE_BUILD_TYPE=Debug
|
||||
|
Loading…
x
Reference in New Issue
Block a user