From 23cbbeea5480a409280e52fcf715ccc7634e8653 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 30 Dec 2022 13:06:44 -0600 Subject: [PATCH] Fixed root cmake root directory - The previous commit changed the invocation of Cmake, which changed the root directory. This broke the web page build. --- firmware/asdf/CMakeLists.txt | 3 +++ firmware/asdf/make-targets.sh | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/firmware/asdf/CMakeLists.txt b/firmware/asdf/CMakeLists.txt index e7521c0..625d115 100644 --- a/firmware/asdf/CMakeLists.txt +++ b/firmware/asdf/CMakeLists.txt @@ -77,6 +77,9 @@ message("SRC Dir is ${PROJECT_SRC_DIR}") set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs) message("Documentation and web page directory is ${DOC_DIR}") +set(CMAKE_INSTALL_PREFIX ${PROJECT_SOURCE_DIR}) +message("Install root: ${CMAKE_INSTALL_PREFIX}") + set (PROJECT_TARGET_NAME ${PROJECT_NAME}-v${PROJECT_VERSION}-${ARCH}) set (PROJECT_EXECUTABLE_TARGET_NAME ${PROJECT_TARGET_NAME}) diff --git a/firmware/asdf/make-targets.sh b/firmware/asdf/make-targets.sh index 7a3403d..e8c2e00 100755 --- a/firmware/asdf/make-targets.sh +++ b/firmware/asdf/make-targets.sh @@ -62,7 +62,8 @@ build_arch() { local target_arch="$1" local hardware_sig="$2" - cmake -S . -B "build-$target_arch" -G "$GENERATOR" -DCMAKE_INSTALL_PREFIX=".." -DARCH="$target_arch" \ + cmake -S . -B "build-$target_arch" -G "$GENERATOR" \ + -DCMAKE_INSTALL_PREFIX=".." -DARCH="$target_arch" \ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" }