feat: move cmake files into src/spl_core

avengineers · Mar 7, 2025 · 9f89f09 · 9f89f09
1 parent 980bee1
commit 9f89f09
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -43,7 +43,7 @@ function Invoke-CommandLine {
 
 function Invoke-Bootstrap {
     # Download bootstrap scripts from external repository
-    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.15.1/install.ps1 | Invoke-Expression
+    Invoke-RestMethod https://raw.githubusercontent.com/avengineers/bootstrap-installer/v1.16.0/install.ps1 | Invoke-Expression
     # Execute bootstrap script
     . .\.bootstrap\bootstrap.ps1
 }

diff --git a/cmake/common.cmake → src/spl_core/common.cmake b/cmake/common.cmake → src/spl_core/common.cmake
diff --git a/cmake/conan.cmake → src/spl_core/conan.cmake b/cmake/conan.cmake → src/spl_core/conan.cmake
diff --git a/cmake/kconfig.cmake → src/spl_core/kconfig.cmake b/cmake/kconfig.cmake → src/spl_core/kconfig.cmake
diff --git a/src/spl_core/kickstart/templates/project/CMakeLists.txt b/src/spl_core/kickstart/templates/project/CMakeLists.txt
@@ -22,7 +22,7 @@ include(FetchContent)
 # Include spl-core
 if(DEFINED ENV{SPLCORE_PATH})
     message(WARNING "SPLCORE_PATH defined! Use fixed SPL-CORE version from: $ENV{SPLCORE_PATH}")
-    include($ENV{SPLCORE_PATH}/cmake/spl.cmake)
+    include($ENV{SPLCORE_PATH}/spl.cmake)
 else()
     # Fetch spl-core
     FetchContent_Declare(

diff --git a/cmake/spl.cmake → src/spl_core/spl.cmake b/cmake/spl.cmake → src/spl_core/spl.cmake
@@ -1,8 +1,8 @@
 # Define the SPL Core root directory to be used to refer to files
 # relative to the SPL Core installation directory.
-set(SPL_CORE_ROOT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/..)
-set(SPL_CORE_CMAKE_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-set(SPL_CORE_PYTHON_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY}/src/spl_core)
+set(SPL_CORE_ROOT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+set(SPL_CORE_CMAKE_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY})
+set(SPL_CORE_PYTHON_DIRECTORY ${SPL_CORE_ROOT_DIRECTORY})
 
 # Always create a compile_commands.json file for C/C++ intellisense / CMake Tools extension
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -23,7 +23,7 @@ foreach(ENVVAR IN LISTS ENVVARS)
 endforeach()
 
 # Include common CMake functions and macros
-include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)
+include(${SPL_CORE_CMAKE_DIRECTORY}/common.cmake)
 
 # Include and run KConfig
 include(${SPL_CORE_CMAKE_DIRECTORY}/kconfig.cmake)

diff --git a/tests/cmake/common.cmake/CMakeLists.txt b/tests/cmake/common.cmake/CMakeLists.txt
@@ -5,7 +5,7 @@ set(VARIANT mytestvariant)
 set(BUILD_KIT prod)
 
 # ## IUT ####################################
-include(${CMAKE_CURRENT_LIST_DIR}/../../../cmake/common.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../../src/spl_core/common.cmake)
 
 # ## test: _spl_slash_to_underscore #########
 # given

diff --git a/tests/cmake/spl.cmake/CMakeLists.txt b/tests/cmake/spl.cmake/CMakeLists.txt
@@ -16,7 +16,7 @@ set(LINKER_BYPRODUCTS_EXTENSIONS "hex")
 set(LINKER_BYPRODUCT_HEX bibi.hex tina.map amadeus.mdf)
 
 # when
-include(${CMAKE_CURRENT_LIST_DIR}/../../../cmake/spl.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../../src/spl_core/spl.cmake)
 
 # expect
 if(NOT LINK_TARGET_NAME STREQUAL "link")

diff --git a/tests/utils.py b/tests/utils.py
@@ -124,7 +124,7 @@ def create_cli_for_spl_project(project_dir: Path) -> CommandLineExecutor:
     The SPL-Core repository is used as a Python dependency and forces the usage of the project directory virtual environment.
     """
     env = os.environ.copy()
-    env["SPLCORE_PATH"] = this_repository_root_dir().as_posix()
+    env["SPLCORE_PATH"] = this_repository_root_dir().joinpath("src/spl_core").as_posix()
     # Force the usage of the project directory virtual environment
     env["PIPENV_IGNORE_VIRTUALENVS"] = "1"
     # Make sure the project directory virtual environment is used