cmake: Fix and test installation

Fix
- Installation of cmake files targets lib/cmake/vatomic

Added
- Small project to test usage of installed cmake files with find_package.
- Action in CI to install vatomic and test build the dependent project

Signed-off-by: Diogo Behrens <[email protected]>

Author: db7

.github/workflows/actions.yml

@@ -4,6 +4,25 @@ env:
   REGISTRY: ghcr.io
 
 jobs:
+  test-install:
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, ubuntu-22.04-arm, macos-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Configure vatomic
+        run: cmake -S. -Bbuild -DCMAKE_INSTALL_PREFIX=/tmp/target
+      - name: Install library
+        run: cmake --install build
+
+      - name: Configure test project
+        run: cmake -Stest/project -Bbuild2 -DCMAKE_PREFIX_PATH=/tmp/target
+      - name: Build test project
+        run: cmake --build build2
+
   test-native:
     strategy:
       matrix:
@@ -14,7 +33,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Configure Testing
-        run: cmake -S. -Bbuild ${{ matrix.config }}
+        run: cmake -S. -Bbuild
       - name: Build Tests
         run: cmake --build build
       - name: Run Tests
@@ -26,17 +45,22 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Configure and Build
+      - name: Configure, Build, Install
         id: test
         uses: vmactions/netbsd-vm@v1
         with:
           release: "10.1"
           usesh: true
           prepare: /usr/sbin/pkg_add curl cmake
           run: |
+              rm -rf /tmp/target
               cmake -S. -Bbuild
-              cmake --build build
+              cmake --build build -DCMAKE_INSTALL_PREFIX=/tmp/target
               ctest --test-dir build --output-on-failure
+              cmake --install build
+              cmake -Stest/project -Bbuild2 -DCMAKE_PREFIX_PATH=/tmp/target
+              cmake --build build2
+
 
   check-expectations:
     runs-on: ubuntu-22.04

CMakeLists.txt

@@ -20,14 +20,9 @@ target_include_directories(
 
 # Prepare install targets
 install(DIRECTORY include/vsync DESTINATION include)
-install(DIRECTORY shared/vsync DESTINATION share)
+install(FILES vmm.cat DESTINATION share/vsync/)
 install(TARGETS vatomic EXPORT ${PROJECT_TARGETS})
 
-# If this is not the top level project, do not enable testing and other targets.
-if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
-    return()
-endif()
-
 # Atomic templating
 add_subdirectory(template)
 add_subdirectory(tmplr)
@@ -57,11 +52,12 @@ add_dependencies(clang-format-apply sanitize-vatomic)
 # General diff check for pipeline
 add_custom_target(diff-check COMMAND git --no-pager diff --exit-code)
 
-# Configure testing
-include(CTest)
-include(ProcessorCount)
-include(cmake/v_add_test.cmake)
-
-enable_testing()
-add_subdirectory(test)
-add_subdirectory(verify)
+# Enable testing and verification only if this is the top level project
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
+    include(ProcessorCount)
+    include(cmake/v_add_test.cmake)
+    enable_testing()
+    add_subdirectory(test)
+    add_subdirectory(verify)
+endif()

cmake/export.cmake

@@ -6,7 +6,7 @@ if(NOT DEFINED PROJECT_TARGETS)
     set(PROJECT_TARGETS "${PROJECT_NAME}Targets")
 endif()
 
-set(PROJECT_CMAKE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake")
+set(PROJECT_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 set(PROJECT_CONFIG_FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake")
 set(PROJECT_VERSION_FILE
     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")

test/project/CMakeLists.txt

@@ -0,0 +1,10 @@
+# Copyright (C) Huawei Technologies Co., Ltd. 2025. All rights reserved.
+# SPDX-License-Identifier: MIT
+
+# set CMAKE_PREFIX_PATH with the CMAKE_INSTALL_PATH used to install vatomic
+
+cmake_minimum_required(VERSION 3.16)
+project(test LANGUAGES C)
+find_package(vatomic CONFIG REQUIRED)
+add_executable(test test.c)
+target_link_libraries(test PRIVATE vatomic::vatomic)

test/project/test.c

@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) Huawei Technologies Co., Ltd. 2025. All rights reserved.
+ * SPDX-License-Identifier: MIT
+ */
+#include <vsync/atomic.h>
+#include <stdio.h>
+
+vatomic32_t count;
+
+int
+main()
+{
+    vatomic_inc(&count);
+    printf("count: %u\n", vatomic_read(&count));
+    return 0;
+}