diff --git a/.gitignore b/.gitignore index 2367b3c749..d17030cb09 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ deps/build-linux/* **/.DS_Store **/.idea/ .pkg_cache +CMakeUserPresets.json diff --git a/cmake/modules/AddCMakeProject.cmake b/cmake/modules/AddCMakeProject.cmake index 4a84da1111..c2cbad67bb 100644 --- a/cmake/modules/AddCMakeProject.cmake +++ b/cmake/modules/AddCMakeProject.cmake @@ -50,12 +50,13 @@ function(add_cmake_project projectname) set(_verbose_switch "-v:d") endif () endif () - + ExternalProject_Add( dep_${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} diff --git a/deps/+Boost/Boost.cmake b/deps/+Boost/Boost.cmake index 62bee98a3a..7e569928ca 100644 --- a/deps/+Boost/Boost.cmake +++ b/deps/+Boost/Boost.cmake @@ -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 diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 8cd09bbbc8..df977d56a2 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -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