vars

bradh352 · Dec 12, 2024 · c6fb1a2 · c6fb1a2
1 parent caa6fd5
commit c6fb1a2
Showing 1 changed file with 8 additions and 4 deletions.
diff --git 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