From 0d89fe50df1fc952d38a2823cb069faeed3cacb6 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Fri, 24 Apr 2026 08:26:07 +0300 Subject: [PATCH 1/2] Fix install CMake files in architecture independent directory --- cmake/InstallProject.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/InstallProject.cmake b/cmake/InstallProject.cmake index e8fb2ba..781eac1 100644 --- a/cmake/InstallProject.cmake +++ b/cmake/InstallProject.cmake @@ -10,12 +10,12 @@ install( EXPORT OpenABFTargets FILE OpenABFTargets.cmake NAMESPACE OpenABF:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenABF + DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/OpenABF ) install( FILES "${CMAKE_CURRENT_BINARY_DIR}/OpenABFConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/OpenABFConfigVersion.cmake" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenABF -) \ No newline at end of file + DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/OpenABF +) From 9af295fc998299a6cab9d54085af15642d7a16e4 Mon Sep 17 00:00:00 2001 From: Seth Parker Date: Fri, 24 Apr 2026 06:56:23 -0400 Subject: [PATCH 2/2] ci: Add test to make sure downstream consumers can find the project with CMake --- .github/workflows/install.yml | 55 +++++++++++++++++++++++++++++++++++ CMakeLists.txt | 1 + tests/install/CMakeLists.txt | 7 +++++ tests/install/main.cpp | 16 ++++++++++ 4 files changed, 79 insertions(+) create mode 100644 .github/workflows/install.yml create mode 100644 tests/install/CMakeLists.txt create mode 100644 tests/install/main.cpp diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml new file mode 100644 index 0000000..06ab15f --- /dev/null +++ b/.github/workflows/install.yml @@ -0,0 +1,55 @@ +name: Install Test + +on: + workflow_call: + push: + branches: [ develop ] + tags: [ 'v*' ] + pull_request: + branches: [ develop ] + +jobs: + install-test: + name: ${{ matrix.distro }} (Multiheader=${{ matrix.multiheader }}) + runs-on: ubuntu-latest + container: ${{ matrix.image }} + strategy: + fail-fast: false + matrix: + distro: [ubuntu-24.04, ubuntu-22.04, debian-bookworm, fedora] + multiheader: [ON, OFF] + include: + - distro: ubuntu-24.04 + image: ubuntu:24.04 + install_deps: apt-get update && apt-get install -y cmake ninja-build build-essential libeigen3-dev + - distro: ubuntu-22.04 + image: ubuntu:22.04 + install_deps: apt-get update && apt-get install -y cmake ninja-build build-essential libeigen3-dev + - distro: debian-bookworm + image: debian:bookworm + install_deps: apt-get update && apt-get install -y cmake ninja-build build-essential libeigen3-dev + - distro: fedora + image: fedora:latest + install_deps: dnf install -y cmake ninja-build gcc-c++ eigen3-devel + + steps: + - uses: actions/checkout@v4 + + - name: Install Dependencies + run: ${{ matrix.install_deps }} + + - name: Install OpenABF + run: | + cmake -G Ninja -S . -B build \ + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install \ + -DOPENABF_MULTIHEADER=${{ matrix.multiheader }} + cmake --install build + + - name: Build Test Project + run: | + cmake -G Ninja -S tests/install -B build_install_test \ + -DCMAKE_PREFIX_PATH=${{ github.workspace }}/install + cmake --build build_install_test + + - name: Run Test + run: ./build_install_test/install_test diff --git a/CMakeLists.txt b/CMakeLists.txt index d8778c0..fcc60a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ if(OPENABF_MULTIHEADER) include/OpenABF/ABFPlusPlus.hpp include/OpenABF/Exceptions.hpp include/OpenABF/HalfEdgeMesh.hpp + include/OpenABF/HierarchicalLSCM.hpp include/OpenABF/AngleBasedLSCM.hpp include/OpenABF/Math.hpp include/OpenABF/Vec.hpp diff --git a/tests/install/CMakeLists.txt b/tests/install/CMakeLists.txt new file mode 100644 index 0000000..76273f6 --- /dev/null +++ b/tests/install/CMakeLists.txt @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.15) +project(OpenABF_InstallTest) + +find_package(OpenABF REQUIRED) + +add_executable(install_test main.cpp) +target_link_libraries(install_test OpenABF::OpenABF) diff --git a/tests/install/main.cpp b/tests/install/main.cpp new file mode 100644 index 0000000..2b6e837 --- /dev/null +++ b/tests/install/main.cpp @@ -0,0 +1,16 @@ +#include +#include + +#include + +int main() +{ + // Verify OpenABF types work (depends on Eigen being found transitively) + OpenABF::Vec3f v{1.0f, 2.0f, 3.0f}; + if (v[0] != 1.0f || v[1] != 2.0f || v[2] != 3.0f) { + std::cerr << "Vec3f value mismatch" << std::endl; + return EXIT_FAILURE; + } + std::cout << "OpenABF find_package test passed" << std::endl; + return EXIT_SUCCESS; +}