Skip to content

Commit 9c0276e

Browse files
committed
Incorrect cmake package path search
1 parent 650fe67 commit 9c0276e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/cppcmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
- {name: "ubuntu-24.04-x64", os: "ubuntu-24.04", arch: "x86_64", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
4444

4545
# ARM Linux builds - cross-compiled with QEMU testing (Jetson, Raspberry Pi compatible)
46-
- {name: "ubuntu-22.04-arm64", os: "ubuntu-22.04", arch: "aarch64", cross_compile: true, cmake_extra: "" }
47-
- {name: "ubuntu-22.04-armhf", os: "ubuntu-22.04", arch: "armv7", cross_compile: true, cmake_extra: "" }
46+
- {name: "ubuntu-22.04-arm64", os: "ubuntu-22.04", arch: "aarch64", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON" }
47+
- {name: "ubuntu-22.04-armhf", os: "ubuntu-22.04", arch: "armv7", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON" }
4848

4949
# Native ARM build (optional - can be enabled for additional validation)
5050
# - {name: "ubuntu-24.04-arm64-native", os: "ubuntu-24.04-arm", arch: "aarch64", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
@@ -124,7 +124,7 @@ jobs:
124124
- name: Configure CMake
125125
run: |
126126
# Set up ccache as compiler wrapper
127-
if [[ "${{ runner.os }}" == "Linux" ]] || [[ "${{ runner.os }}" == "macOS" ]]; then
127+
if [[ "${{ runner.os }}" == "Linux" || "${{ runner.os }}" == "macOS" ]] && [[ "${{ matrix.config.cross_compile }}" != "true" ]]; then
128128
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
129129
export CC="ccache gcc"
130130
export CXX="ccache g++"

cmake/toolchains/aarch64-linux-gnu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1717
# Search for libraries and headers in the target directories
1818
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1919
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
20-
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
20+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
2121

2222
# Set additional compiler flags for better compatibility
2323
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a" CACHE STRING "C flags")

cmake/toolchains/arm-linux-gnueabihf.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1717
# Search for libraries and headers in the target directories
1818
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1919
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
20-
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
20+
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH)
2121

2222
# Set additional compiler flags for ARMv7 with NEON support
2323
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon-vfpv4 -mfloat-abi=hard" CACHE STRING "C flags")

0 commit comments

Comments
 (0)