From c6fb1a244f35436dfa5c1175623d0367b80bee8c Mon Sep 17 00:00:00 2001
From: Brad House <brad@brad-house.com>
Date: Thu, 12 Dec 2024 15:54:29 -0500
Subject: [PATCH] vars

---
 .github/workflows/qnx.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/qnx.yml b/.github/workflows/qnx.yml
index e8769a2b85..453a038c97 100644
--- a/.github/workflows/qnx.yml
+++ b/.github/workflows/qnx.yml
@@ -14,8 +14,8 @@ env:
   CXX: q++
   CFLAGS: "-V gcc_ntox86_64"
   CXXFLAGS: "-V gcc_ntox86_64"
-  QNX_TARGET: "${{ github.workspace }}/qnx800/target/qnx"
-  CMAKE_FIND_ROOT_PATH: "${{ github.workspace }}/qnx800/target/qnx;${{ github.workspace }}/qnx800/target/qnx/x86_64"
+  CPUVARDIR: "x86_64"
+  CMAKE_FIND_ROOT_PATH: "${QNX_TARGET};${QNX_TARGET}/${CPUVARDIR}"
   CONFIG_OPTS: "--host=x86_64-unknown-nto-qnx8.0.0"
 
 jobs:
@@ -51,11 +51,15 @@ jobs:
         with:
           repository: qnx-ports/googletest
           path: googletest
+      - name: Set CMAKE_FIND_ROOT_PATH
+        run: |
+          source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
+          echo "CMAKE_FIND_ROOT_PATH=${QNX_TARGET};${QNX_TARGET}/${CPUVARDIR}" >> $GITHUB_ENV
       - name: Build googletest
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
           cd googletest
-          cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_STAGING_PREFIX=${QNX_TARGET}/x86_64/usr -DCMAKE_INSTALL_INCLUDEDIR=${QNX_TARGET}/usr/include -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH} -DBUILD_GMOCK=ON -DINSTALL_GTEST=ON -Dgtest_disable_pthreads=ON -DCMAKE_VERBOSE_MAKEFILE=ON .
+          cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_STAGING_PREFIX=${QNX_TARGET}/x86_64/usr -DCMAKE_INSTALL_INCLUDEDIR=${QNX_TARGET}/usr/include -DCMAKE_FIND_ROOT_PATH="${CMAKE_FIND_ROOT_PATH}" -DBUILD_GMOCK=ON -DINSTALL_GTEST=ON -Dgtest_disable_pthreads=ON -DCMAKE_VERBOSE_MAKEFILE=ON .
           gmake
           gmake install
       - name: Checkout c-ares
@@ -65,7 +69,7 @@ jobs:
       - name: "CMake: build c-ares"
         env:
           BUILD_TYPE: CMAKE
-          CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=DEBUG -DCARES_STATIC=ON -DCARES_STATIC_PIC=ON -DCARES_BUILD_TESTS=ON -G Ninja -DCMAKE_SYSTEM_NAME=QNX -DCMAKE_FIND_ROOT_PATH=${{ env.CMAKE_FIND_ROOT_PATH }} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"
+          CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=DEBUG -DCARES_STATIC=ON -DCARES_STATIC_PIC=ON -DCARES_BUILD_TESTS=ON -G Ninja -DCMAKE_SYSTEM_NAME=QNX -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY"
         run: |
           source "${{ github.workspace }}/qnx800/qnxsdp-env.sh"
           cd c-ares