mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
3dc4928b6c
Update FoundationDB to both main supported versions, and also split between server and client builds for convenience. PR: 277262 Reviewed by: dch Sponsored by: SkunkWerks, GmbH
64 lines
2.7 KiB
Text
64 lines
2.7 KiB
Text
--- bindings/c/CMakeLists.txt.orig 2024-01-09 21:06:41 UTC
|
|
+++ bindings/c/CMakeLists.txt
|
|
@@ -100,7 +100,7 @@ if(WIN32)
|
|
endif()
|
|
|
|
# The tests don't build on windows
|
|
-if(NOT WIN32)
|
|
+if(FALSE)
|
|
set(MAKO_SRCS
|
|
test/mako/admin_server.hpp
|
|
test/mako/admin_server.cpp
|
|
@@ -212,7 +212,7 @@ if(NOT WIN32)
|
|
|
|
target_include_directories(fdb_c_api_tester_impl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/ ${CMAKE_SOURCE_DIR}/flow/include ${CMAKE_BINARY_DIR}/flow/include)
|
|
target_link_libraries(fdb_c_api_tester_impl PRIVATE fdb_cpp toml11_target Threads::Threads fmt::fmt boost_target)
|
|
- if(NOT APPLE)
|
|
+ if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
target_link_libraries(fdb_c_api_tester_impl PRIVATE stdc++fs)
|
|
endif()
|
|
target_link_libraries(fdb_c_api_tester_impl PRIVATE SimpleOpt)
|
|
@@ -439,6 +439,11 @@ elseif(NOT WIN32 AND NOT APPLE) # Linux Only
|
|
${SHIM_LIB_OUTPUT_DIR}/libfdb_c.so.tramp.S)
|
|
|
|
set(IMPLIBSO_SRC_DIR ${CMAKE_SOURCE_DIR}/contrib/Implib.so)
|
|
+
|
|
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
|
|
+ set(CMAKE_SYSTEM_PROCESSOR "x86_64")
|
|
+ endif()
|
|
+
|
|
set(IMPLIBSO_SRC
|
|
${IMPLIBSO_SRC_DIR}/implib-gen.py
|
|
${IMPLIBSO_SRC_DIR}/arch/common/init.cpp.tpl
|
|
@@ -464,31 +469,6 @@ elseif(NOT WIN32 AND NOT APPLE) # Linux Only
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/foundationdb>)
|
|
-
|
|
- add_executable(fdb_c_shim_unit_tests)
|
|
- target_link_libraries(fdb_c_shim_unit_tests PRIVATE fdb_c_shim fdb_c_unit_tests_impl)
|
|
-
|
|
- add_executable(fdb_c_shim_api_tester)
|
|
- target_link_libraries(fdb_c_shim_api_tester PRIVATE fdb_c_shim fdb_c_api_tester_impl)
|
|
-
|
|
- add_executable(fdb_c_shim_lib_tester test/shim_lib_tester.cpp)
|
|
- target_link_libraries(fdb_c_shim_lib_tester PRIVATE fdb_c_shim SimpleOpt fdb_cpp Threads::Threads)
|
|
- target_include_directories(fdb_c_shim_lib_tester PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/foundationdb/ ${CMAKE_SOURCE_DIR}/flow/include)
|
|
-
|
|
- set(SHIM_LIB_TEST_EXTRA_OPTIONS "")
|
|
- if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR USE_SANITIZER)
|
|
- list(APPEND SHIM_LIB_TEST_EXTRA_OPTIONS --disable-prev-version-tests)
|
|
- endif()
|
|
-
|
|
- add_python_venv_test(NAME fdb_c_shim_library_tests
|
|
- COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/test/fdb_c_shim_tests.py
|
|
- --build-dir ${CMAKE_BINARY_DIR}
|
|
- --unit-tests-bin $<TARGET_FILE:fdb_c_shim_unit_tests>
|
|
- --api-tester-bin $<TARGET_FILE:fdb_c_shim_api_tester>
|
|
- --shim-lib-tester-bin $<TARGET_FILE:fdb_c_shim_lib_tester>
|
|
- --api-test-dir ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests
|
|
- ${SHIM_LIB_TEST_EXTRA_OPTIONS}
|
|
- )
|
|
|
|
endif() # End Linux only
|
|
|