[cbuild2cmake] Make contextlists buildable independent of superlists

Open-CMSIS-Pack · Aug 27, 2024 · e3a14c7 · e3a14c7
1 parent a153a20
commit e3a14c7
Show file tree

Hide file tree

Showing 34 changed files with 127 additions and 7 deletions.
diff --git a/pkg/maker/contextlists.go b/pkg/maker/contextlists.go
@@ -110,6 +110,9 @@ func (m *Maker) CreateContextCMakeLists(index int) error {
 	// Create CMakeLists content
 	content := `cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT ` + cbuild.BuildDescType.Context + `)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "` + outDir + `")

diff --git a/pkg/maker/superlists.go b/pkg/maker/superlists.go
@@ -53,6 +53,12 @@ func (m *Maker) CreateSuperCMakeLists() error {
 		logConfigure += "\n    LOG_OUTPUT_ON_FAILURE ON"
 	}
 
+	// Create roots.cmake
+	err := m.CMakeCreateRoots(solutionRoot)
+	if err != nil {
+		return err
+	}
+
 	// Write content
 	content :=
 		`cmake_minimum_required(VERSION 3.22)
@@ -61,12 +67,7 @@ include(ExternalProject)
 project("` + csolution + `" NONE)
 
 # Roots
-set(CMSIS_PACK_ROOT "` + m.EnvVars.PackRoot + `")
-cmake_path(ABSOLUTE_PATH CMSIS_PACK_ROOT NORMALIZE OUTPUT_VARIABLE CMSIS_PACK_ROOT)
-set(CMSIS_COMPILER_ROOT "` + m.EnvVars.CompilerRoot + `")
-cmake_path(ABSOLUTE_PATH CMSIS_COMPILER_ROOT NORMALIZE OUTPUT_VARIABLE CMSIS_COMPILER_ROOT)
-set(SOLUTION_ROOT "` + solutionRoot + `")
-cmake_path(ABSOLUTE_PATH SOLUTION_ROOT NORMALIZE OUTPUT_VARIABLE SOLUTION_ROOT)
+include("roots.cmake")
 
 # Context specific lists
 set(CONTEXTS
@@ -122,11 +123,31 @@ foreach(INDEX RANGE ${CONTEXTS_LENGTH})
 endforeach()` + ExecutesCommands(m.CbuildIndex.BuildIdx.Executes) + m.BuildDependencies() + `
 `
 	superCMakeLists := path.Join(m.SolutionTmpDir, "CMakeLists.txt")
-	err := utils.UpdateFile(superCMakeLists, content)
+	err = utils.UpdateFile(superCMakeLists, content)
 	if err != nil {
 		return err
 	}
 
 	log.Info("CMakeLists were successfully generated in the " + m.SolutionTmpDir + " directory")
 	return nil
 }
+
+func (m *Maker) CMakeCreateRoots(solutionRoot string) error {
+	content :=
+		`# roots.cmake
+set(CMSIS_PACK_ROOT "` + m.EnvVars.PackRoot + `" CACHE PATH "CMSIS pack root")
+cmake_path(ABSOLUTE_PATH CMSIS_PACK_ROOT NORMALIZE OUTPUT_VARIABLE CMSIS_PACK_ROOT)
+set(CMSIS_COMPILER_ROOT "` + m.EnvVars.CompilerRoot + `" CACHE PATH "CMSIS compiler root")
+cmake_path(ABSOLUTE_PATH CMSIS_COMPILER_ROOT NORMALIZE OUTPUT_VARIABLE CMSIS_COMPILER_ROOT)
+set(SOLUTION_ROOT "` + solutionRoot + `" CACHE PATH "CMSIS solution root")
+cmake_path(ABSOLUTE_PATH SOLUTION_ROOT NORMALIZE OUTPUT_VARIABLE SOLUTION_ROOT)
+`
+
+	filename := path.Join(m.SolutionTmpDir, "roots.cmake")
+	err := utils.UpdateFile(filename, content)
+	if err != nil {
+		return err
+	}
+
+	return err
+}
diff --git a/test/data/solutions/build-asm/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/build-asm/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/build-asm/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/build-asm/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/build-c/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/build-c/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/build-c/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/build-c/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/build-cpp/ref/project.AC6+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.AC6+ARMCM55/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM55)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM55/AC6")

diff --git a/test/data/solutions/build-cpp/ref/project.CLANG+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.CLANG+ARMCM55/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM55)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM55/CLANG")

diff --git a/test/data/solutions/build-cpp/ref/project.GCC+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.GCC+ARMCM55/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM55)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM55/GCC")

diff --git a/test/data/solutions/build-cpp/ref/project.IAR+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.IAR+ARMCM55/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM55)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM55/IAR")

diff --git a/test/data/solutions/include-define/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/include-define/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/include-define/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/include-define/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/language-scope/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/language-scope/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/language-scope/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/language-scope/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/library-rtos/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/library-rtos/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/library-rtos/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/library-rtos/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")

diff --git a/test/data/solutions/pre-include/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.AC6+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/AC6")

diff --git a/test/data/solutions/pre-include/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.CLANG+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/CLANG")

diff --git a/test/data/solutions/pre-include/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.GCC+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/GCC")

diff --git a/test/data/solutions/pre-include/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.27)
 
+# Roots
+include("../roots.cmake")
+
 set(CONTEXT project.IAR+ARMCM0)
 set(TARGET ${CONTEXT})
 set(OUT_DIR "${SOLUTION_ROOT}/out/project/ARMCM0/IAR")