From 14ad19e0641f27e413ee9684889df755463e238d Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Sat, 3 Nov 2018 13:12:37 -0400 Subject: Use native PATH environment-variable separator on Windows for PYTHONPATH. Fixes 'Bad address' error in cmake. Signed-off-by: William D. Jones --- ecp5/family.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ecp5') diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 6322e24e..ebe654af 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -18,7 +18,11 @@ file(MAKE_DIRECTORY ecp5/chipdbs/) add_library(ecp5_chipdb OBJECT ecp5/chipdbs/) target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) target_include_directories(ecp5_chipdb PRIVATE ${family}/) +if (WIN32) +set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${TRELLIS_ROOT}/libtrellis\;${TRELLIS_ROOT}/util/common\"") +else() set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${TRELLIS_ROOT}/libtrellis:${TRELLIS_ROOT}/util/common") +endif() if (MSVC) target_sources(ecp5_chipdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resource/embed.cc) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resources/chipdb.rc PROPERTIES LANGUAGE RC) -- cgit v1.2.3