From a3e170093d5b3d3e8887ac18c63f8feddfd1ccfb Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Wed, 5 Jul 2023 10:22:09 +0200 Subject: [PATCH] Set `SPICY_BUILD_DIRECTORY` in `zeek-path-dev`. Having this set allows running Spicy tests from inside `auxil/spicy/tests`. --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fb9255573..fc24389f88 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -514,7 +514,8 @@ file( "export PATH=\"${cmake_binary_dir}\":\"${cmake_binary_dir}/src\":\"${cmake_binary_dir}/auxil/spicy/bin\":\"${cmake_binary_dir}/src/spicy/spicyz\":$\{PATH\}\n" "export SPICY_PATH=`${cmake_binary_dir}/spicy-path`\n" "export HILTI_CXX_INCLUDE_DIRS=`${cmake_binary_dir}/hilti-cxx-include-dirs`\n" - "export ZEEK_SPICY_LIBRARY_PATH=${cmake_source_dir}/scripts/spicy\n") + "export ZEEK_SPICY_LIBRARY_PATH=${cmake_source_dir}/scripts/spicy\n" + "export SPICY_BUILD_DIRECTORY=${cmake_binary_dir}/auxil/spicy\n") file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev.csh @@ -523,7 +524,8 @@ file( "setenv PATH \"${cmake_binary_dir}\":\"${cmake_binary_dir}/src\":\"${cmake_binary_dir}/auxil/spicy/bin\":\"${cmake_binary_dir}/src/spicy/spicyz\":$\{PATH\}\n" "setenv SPICY_PATH \"`${cmake_binary_dir}/spicy-path`\"\n" "setenv HILTI_CXX_INCLUDE_DIRS \"`${cmake_binary_dir}/hilti-cxx-include-dirs`\"\n" - "setenv ZEEK_SPICY_LIBRARY_PATH \"${cmake_source_dir}/scripts/spicy\"\n") + "setenv ZEEK_SPICY_LIBRARY_PATH \"${cmake_source_dir}/scripts/spicy\"\n" + "setenv SPICY_BUILD_DIRECTORY \"${cmake_binary_dir}/auxil/spicy\"\n") file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1) execute_process(