fix yocoto installation of cmake for usermerge feature

Yocto requires all binaries and library to be installed in /usr directory for usermerge feature to work. Signed-off-by: Mahesh Rao <[email protected]>
altera-opensource · Sep 5, 2024 · 21b64b1 · 21b64b1
1 parent c18034b
commit 21b64b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -48,10 +48,10 @@ jobs:
           script: |
             set -ex
             cmake --install ${{github.workspace}}/work/build --prefix=${{github.workspace}}/work/deploy -v --component uniLibRSU_lib_Runtime
-            test -f "${{github.workspace}}/work/deploy/lib/libuniLibRSU.so.$(cat ${{github.workspace}}/work/build/CMakeCache.txt  | grep CMAKE_PROJECT_VERSION_MAJOR |  cut -d "=" -f2)"
-            test -f "${{github.workspace}}/work/deploy/include/RSU_OSAL_types.h"
-            test -f "${{github.workspace}}/work/deploy/include/libRSU.h"
-            test -f "${{github.workspace}}/work/deploy/include/libRSU_OSAL.h"
+            test -f "${{github.workspace}}/work/deploy/usr/lib/libuniLibRSU.so.$(cat ${{github.workspace}}/work/build/CMakeCache.txt  | grep CMAKE_PROJECT_VERSION_MAJOR |  cut -d "=" -f2)"
+            test -f "${{github.workspace}}/work/deploy/usr/include/RSU_OSAL_types.h"
+            test -f "${{github.workspace}}/work/deploy/usr/include/libRSU.h"
+            test -f "${{github.workspace}}/work/deploy/usr/include/libRSU_OSAL.h"
             test -f "${{github.workspace}}/work/deploy/etc/librsu.rc"
 
       - name: deploy client application
@@ -64,4 +64,4 @@ jobs:
           script: |
             set -ex
             cmake --install ${{github.workspace}}/work/build --prefix=${{github.workspace}}/work/deploy -v --component uniLibRSU_client_Runtime_GSRD
-            test -x "${{github.workspace}}/work/deploy/sbin/rsu_client"
+            test -x "${{github.workspace}}/work/deploy/usr/bin/rsu_client"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,7 @@
 cmake_minimum_required(VERSION 3.24)
 
 include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
 
 include(cmake/platform.cmake)
 include(cmake/coverage.cmake)
@@ -81,26 +82,26 @@ if(PLATFORM STREQUAL linux-aarch64)
 
   install(TARGETS uniLibRSU
   LIBRARY
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    DESTINATION usr/lib
     COMPONENT uniLibRSU_lib_Development
   PUBLIC_HEADER
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    DESTINATION usr/include
     COMPONENT uniLibRSU_lib_Development
   ARCHIVE
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    DESTINATION usr/lib
     COMPONENT uniLibRSU_lib_Development
   )
 
   install(TARGETS uniLibRSU
   LIBRARY
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    DESTINATION usr/lib
     COMPONENT uniLibRSU_lib_Runtime
     NAMELINK_SKIP
   ARCHIVE
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    DESTINATION usr/lib
     COMPONENT uniLibRSU_lib_Runtime
   PUBLIC_HEADER
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    DESTINATION usr/include
     COMPONENT uniLibRSU_lib_Runtime
   )
 

diff --git a/linux-example/CMakeLists.txt b/linux-example/CMakeLists.txt
@@ -24,6 +24,6 @@ set_target_properties(rsu_client PROPERTIES
 
 install(TARGETS rsu_client
   RUNTIME
-    DESTINATION ${CMAKE_INSTALL_SBINDIR}
+    DESTINATION usr/bin
     COMPONENT uniLibRSU_client_Runtime_GSRD
 )