Skip to content

Pass CDT_CONTRACT_INCLUDE_PATH to contract builds #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heifner wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

Pass CDT_CONTRACT_INCLUDE_PATH to contract builds #273

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion cmake/contract-tools.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,18 @@ message(STATUS "CDT_ROOT is set to: ${CDT_ROOT}")

if(BUILD_SYSTEM_CONTRACTS AND NOT CDT_BUILD)
set(SYSIO_WASM_OLD_BEHAVIOR "Off")
set(CDT_CONTRACT_INCLUDE_PATH "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
message(NOTICE "CDT_CONTRACT_INCLUDE_PATH = ${CDT_CONTRACT_INCLUDE_PATH}")
find_package(cdt REQUIRED)
set(
CDT_CMAKE_ARGS -DCDT_ROOT=${CDT_ROOT} -DCMAKE_TOOLCHAIN_FILE=${CDT_ROOT}/lib/cmake/cdt/CDTWasmToolchain.cmake -DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR} -DBUILD_SYSTEM_CONTRACTS=ON -DBUILD_TEST_CONTRACTS=${BUILD_TEST_CONTRACTS} -DCDT_BUILD=ON
CDT_CMAKE_ARGS
-DCDT_ROOT=${CDT_ROOT}
-DCMAKE_TOOLCHAIN_FILE=${CDT_ROOT}/lib/cmake/cdt/CDTWasmToolchain.cmake
-DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}
-DBUILD_SYSTEM_CONTRACTS=ON
-DBUILD_TEST_CONTRACTS=${BUILD_TEST_CONTRACTS}
-DCDT_BUILD=ON
-DCDT_CONTRACT_INCLUDE_PATH=${CDT_CONTRACT_INCLUDE_PATH}
)
if (CDT_ROOT AND EXISTS ${CDT_ROOT}/lib/cmake/cdt/cdt-config.cmake)
list(APPEND CDT_CMAKE_ARGS -DCDT_ROOT=${CDT_ROOT})
Expand Down
Loading