Merge branch 'master' into gcc-ci

pretis · Sep 16, 2024 · 3ce7eae · 3ce7eae
2 parents ecab449 + 772d12d
commit 3ce7eae
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt
@@ -1,17 +1,6 @@
 cmake_minimum_required(VERSION 3.22)
 
-include($ENV{FP_SDK_PATH}/cmake/riscv-toolchain.cmake)
-
-project(fp-sdk
-  DESCRIPTION "Software development kit (SDK) for FlexPRET"
-  LANGUAGES C ASM
-  VERSION 0.0.1
-)
-
-if (NOT DEFINED TARGET)
-  set(TARGET "emulator" CACHE STRING "Whether to compile SDK to target FlexPRET on emulator or FPGA" FORCE)
-endif()
-
+# Check environment variables are set before anything else
 set(ENVS
   FP_PATH
   FP_SDK_PATH
@@ -24,6 +13,18 @@ foreach(env ${ENVS})
   endif()
 endforeach()
 
+include($ENV{FP_SDK_PATH}/cmake/riscv-toolchain.cmake)
+
+project(fp-sdk
+  DESCRIPTION "Software development kit (SDK) for FlexPRET"
+  LANGUAGES C ASM
+  VERSION 0.0.1
+)
+
+if (NOT DEFINED TARGET)
+  set(TARGET "emulator" CACHE STRING "Whether to compile SDK to target FlexPRET on emulator or FPGA" FORCE)
+endif()
+
 set(FP_INSTALLED_FILES
   "flexpret/fp-emu"
   "flexpret/hwconfig.cmake"