From 054be6fb6700eae02ec1a47ecf3d4c2838ee06d2 Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Tue, 3 Mar 2020 15:32:00 +0100 Subject: build: Default the ECP5 and iCE40 roots to the install prefix If the user specifies a custom install prefix, chances are icestrom/trellis are also in that prefix rather than the hardcoded /usr/local Fixes #351 Signed-off-by: Sylvain Munaut --- ecp5/family.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ecp5') diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 8756aa36..14112964 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -2,8 +2,8 @@ if (NOT EXTERNAL_CHIPDB) set(devices 25k 45k 85k) if (NOT DEFINED TRELLIS_INSTALL_PREFIX) - message(STATUS "TRELLIS_INSTALL_PREFIX not defined using -DTRELLIS_INSTALL_PREFIX=/path-prefix/to/prjtrellis-installation. Default to /usr/local or reset by -DCMAKE_INSTALL_PREFIX when building prjtrellis/libtrellis") - set(TRELLIS_INSTALL_PREFIX "/usr/local") + message(STATUS "TRELLIS_INSTALL_PREFIX not defined using -DTRELLIS_INSTALL_PREFIX=/path-prefix/to/prjtrellis-installation. Defaulted to ${CMAKE_INSTALL_PREFIX}") + set(TRELLIS_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) endif() if (NOT DEFINED PYTRELLIS_LIBDIR) -- cgit v1.2.3