From cb4846a58d5a7f718fdc05e00d1cd22f15427a77 Mon Sep 17 00:00:00 2001 From: rowanG077 Date: Wed, 7 Jun 2023 17:11:39 +0200 Subject: [PATCH] build: push INSTALL_PREFIX from env to cmake var --- ecp5/CMakeLists.txt | 8 +++++++- ice40/CMakeLists.txt | 2 ++ nexus/CMakeLists.txt | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ecp5/CMakeLists.txt b/ecp5/CMakeLists.txt index 115e0ce8..758b7f90 100644 --- a/ecp5/CMakeLists.txt +++ b/ecp5/CMakeLists.txt @@ -21,7 +21,13 @@ else() message(STATUS "Trellis program prefix: ${TRELLIS_PROGRAM_PREFIX}") endif() - set(TRELLIS_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING + IF(DEFINED ENV{TRELLIS_INSTALL_PREFIX}) + set(trellis_default_install_prefix $ENV{TRELLIS_INSTALL_PREFIX}) + ELSE() + set(trellis_default_install_prefix ${CMAKE_INSTALL_PREFIX}) + ENDIF() + + set(TRELLIS_INSTALL_PREFIX ${trellis_default_install_prefix} CACHE STRING "Trellis install prefix") message(STATUS "Trellis install prefix: ${TRELLIS_INSTALL_PREFIX}") diff --git a/ice40/CMakeLists.txt b/ice40/CMakeLists.txt index 3bdfa26d..7d18097c 100644 --- a/ice40/CMakeLists.txt +++ b/ice40/CMakeLists.txt @@ -22,6 +22,8 @@ else() get_filename_component(dir ${ICEBOX_ROOT} DIRECTORY) get_filename_component(dir ${dir} DIRECTORY) set(icestorm_default_install_prefix ${dir}) + elseif(DEFINED ENV{ICESTORM_INSTALL_PREFIX}) + set(icestorm_default_install_prefix $ENV{ICESTORM_INSTALL_PREFIX}) endif() set(ICESTORM_INSTALL_PREFIX ${icestorm_default_install_prefix} CACHE STRING "IceStorm install prefix") diff --git a/nexus/CMakeLists.txt b/nexus/CMakeLists.txt index d58bd689..22e785f7 100644 --- a/nexus/CMakeLists.txt +++ b/nexus/CMakeLists.txt @@ -13,7 +13,12 @@ if(DEFINED NEXUS_CHIPDB) add_custom_target(chipdb-nexus-bbas ALL) else() # shared among all families - set(OXIDE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE STRING + IF(DEFINED ENV{OXIDE_INSTALL_PREFIX}) + set(oxide_default_install_prefix $ENV{OXIDE_INSTALL_PREFIX}) + ELSE() + set(oxide_default_install_prefix ${CMAKE_INSTALL_PREFIX}) + ENDIF() + set(OXIDE_INSTALL_PREFIX "${oxide_default_install_prefix}" CACHE STRING "prjoxide install prefix") message(STATUS "prjoxide install prefix: ${OXIDE_INSTALL_PREFIX}")