fix cmake install prefix (#16)

* fix cmake install prefix * added CMake cache fields * update version ID to v1.3.9 --------- Co-authored-by: Thomas Irgang (thir820) <[email protected]>
Elektrobit · Oct 22, 2024 · 9727219 · 9727219
1 parent 732dbe9
commit 9727219
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/configuration/build_config.yaml b/configuration/build_config.yaml
@@ -1,7 +1,7 @@
 Base-Name: sdk
 Repository: linux.elektrobit.com/ebcl
 Base-Container: ubuntu:22.04
-Version: v1.3.8
+Version: v1.3.9
 Layers:
   - ../layers/base
   - ../layers/pbuilder

diff --git a/layers/appdev/conf/cmake/toolchain-aarch64.cmake b/layers/appdev/conf/cmake/toolchain-aarch64.cmake
@@ -15,4 +15,4 @@ set(ENV{PKG_CONFIG_DIR} "")
 set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_FIND_ROOT_PATH}/usr/lib/aarch64-linux-gnu/pkgconfig/:${CMAKE_FIND_ROOT_PATH}/usr/share/pkgconfig")
 set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_FIND_ROOT_PATH})
 
-set(CMAKE_INSTALL_PREFIX "/usr")
+set(CMAKE_INSTALL_PREFIX "/" CACHE STRING "Install prefix" FORCE)
diff --git a/layers/appdev/conf/cmake/toolchain-x86_64.cmake b/layers/appdev/conf/cmake/toolchain-x86_64.cmake
@@ -15,4 +15,4 @@ set(ENV{PKG_CONFIG_DIR} "")
 set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_FIND_ROOT_PATH}/usr/lib/x86_64-linux-gnu/pkgconfig/:${CMAKE_FIND_ROOT_PATH}/usr/share/pkgconfig")
 set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_FIND_ROOT_PATH})
 
-set(CMAKE_INSTALL_PREFIX "/usr")
+set(CMAKE_INSTALL_PREFIX "/" CACHE STRING "Install prefix" FORCE)