Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/windows-boost-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:

- name: Install Boost via vcpkg
run: |
vcpkg install boost-filesystem:x64-windows boost-iostreams:x64-windows boost-serialization:x64-windows boost-system:x64-windows boost-program-options:x64-windows boost-url:x64-windows boost-context:x64-windows
vcpkg install boost-filesystem:x64-windows boost-iostreams:x64-windows boost-serialization:x64-windows boost-system:x64-windows boost-program-options:x64-windows boost-url:x64-windows boost-context:x64-windows lz4:x64-windows
shell: cmd

- name: Configure and Build FoundationDB (without Swift)
run: |
mkdir build
cd build
cmake .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DWITH_SWIFT=OFF -DBUILD_TESTING=OFF
cmake .. -DCMAKE_TOOLCHAIN_FILE=%VCPKG_INSTALLATION_ROOT%\scripts\buildsystems\vcpkg.cmake -DCMAKE_BUILD_TYPE=Release -DWITH_SWIFT=OFF -DBUILD_TESTING=OFF -DBUILD_DOCUMENTATION=OFF -DWITH_CSHARP=OFF
shell: cmd

- name: Verify Build Success
Expand Down
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ project(foundationdb
VERSION 8.0.0
DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
HOMEPAGE_URL "http://www.foundationdb.org/"
LANGUAGES C CXX ASM Swift)
LANGUAGES C CXX ASM)

if(WITH_SWIFT)
enable_language(Swift)
endif()

list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

Expand Down
2 changes: 1 addition & 1 deletion cmake/CompileBoost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ endif()
if(WIN32)
# Use CONFIG mode to prefer Boost's BoostConfig.cmake over deprecated FindBoost module
# This is required for CMake 3.30+ compatibility (policy CMP0167)
find_package(Boost 1.86.0 EXACT QUIET COMPONENTS filesystem iostreams serialization system program_options url CONFIG PATHS ${BOOST_HINT_PATHS})
find_package(Boost 1.86.0 QUIET COMPONENTS filesystem iostreams serialization system program_options url CONFIG PATHS ${BOOST_HINT_PATHS})
add_library(boost_target INTERFACE)
target_link_libraries(boost_target INTERFACE Boost::boost Boost::filesystem Boost::iostreams Boost::serialization Boost::system Boost::url)

Expand Down
1 change: 1 addition & 0 deletions cmake/CompileVexillographer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ if(WIN32 AND FDB_USE_CSHARP_TOOLS)
TARGET vexillographer PROPERTY VS_DOTNET_REFERENCES "System" "System.Core"
"System.Data" "System.Xml" "System.Xml.Linq")
set(VEXILLOGRAPHER_DEPENDS vexillographer)
set(VEXILLOGRAPHER_COMMAND $<TARGET_FILE:vexillographer>)
elseif(FDB_USE_CSHARP_TOOLS AND CSHARP_TOOLCHAIN_FOUND)
if(CSHARP_USE_MONO)
set(VEXILLOGRAPHER_REFERENCES
Expand Down
4 changes: 3 additions & 1 deletion cmake/ConfigureCompiler.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ endif()

include(CheckFunctionExists)
set(CMAKE_REQUIRED_INCLUDES stdlib.h malloc.h)
set(CMAKE_REQUIRED_LIBRARIES c)
if(NOT WIN32)
set(CMAKE_REQUIRED_LIBRARIES c)
endif()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
2 changes: 1 addition & 1 deletion flow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if(NOT Jinja2_FOUND)
${PROTOCOL_VERSION_VENV_DIR} OUTPUT_QUIET ERROR_QUIET)
find_program(
VENV_Python3_EXECUTABLE
NAMES python3 python3.exe
NAMES python3 python3.exe python.exe
PATHS ${PROTOCOL_VERSION_VENV_DIR}/Scripts ${PROTOCOL_VERSION_VENV_DIR}/bin
REQUIRED
NO_DEFAULT_PATH NO_CACHE
Expand Down
12 changes: 10 additions & 2 deletions packaging/msi/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
find_package(WIX)

if(WIX_FOUND)
if(TARGET fdbmonitor)
set(FDBMONITOR_ARG -Dfdbmonitor=$<TARGET_FILE:fdbmonitor>)
else()
set(FDBMONITOR_ARG "")
endif()
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wxs
COMMAND ${CMAKE_COMMAND}
-DOUT=${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wxs
-DIN=${CMAKE_CURRENT_SOURCE_DIR}/FDBInstaller.wxs.cmake
-Dfdbserver=$<TARGET_FILE:fdbserver>
-Dfdbcli=$<TARGET_FILE:fdbcli>
-Dfdbbackup=$<TARGET_FILE:fdbbackup>
-Dfdbmonitor=$<TARGET_FILE:fdbmonitor>
${FDBMONITOR_ARG}
-Dfdbc=$<TARGET_FILE:fdb_c>
-DSOURCE_ROOT=${CMAKE_SOURCE_DIR}
-DBUILD_ROOT=${CMAKE_BINARY_DIR}
Expand All @@ -27,7 +32,10 @@ if(WIX_FOUND)
COMMENT "Create WIX Object file"
)
add_custom_target(wixobj DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/FDBInstaller.wixobj)
add_dependencies(wixobj fdbserver fdbcli fdbmonitor fdb_c fdbbackup python_binding)
if(TARGET fdbmonitor)
add_dependencies(wixobj fdbmonitor)
endif()
add_dependencies(wixobj fdbserver fdbcli fdb_c fdbbackup python_binding)
if(NOT FDB_RELEASE)
set(not_fdb_release_string "-SNAPSHOT")
else()
Expand Down
Loading