diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cd9acb76..8fd145fd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -121,12 +121,12 @@ jobs: - name: Build Deps run: | echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos - echo "Qt6_Dir=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/${{ matrix.QT_ARCH }}" >> $GITHUB_ENV - echo "Qt6_HOST_Dir=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos" >> $GITHUB_ENV + echo "Qt6_DIR=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/${{ matrix.QT_ARCH }}" >> $GITHUB_ENV + echo "Qt6_HOST_DIR=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos" >> $GITHUB_ENV echo "PATH=${{ env.VCPKG_ROOT }}:$PATH" >> $GITHUB_ENV vcpkg --version - ls -l ${Qt6_HOST_Dir}/../ + ls -l ${Qt6_DIR}/lib mkdir -p ${{ github.workspace }}/build cd ${{ github.workspace }}/build diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index a73df9d4..db014808 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -89,12 +89,12 @@ jobs: mkdir -p ${{ github.workspace }}/build cd ${{ github.workspace }}/build - echo "Qt6_Dir=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/ios" >> $GITHUB_ENV - echo "Qt6_HOST_Dir=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos" >> $GITHUB_ENV + echo "Qt6_DIR=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/ios" >> $GITHUB_ENV + echo "Qt6_HOST_DIR=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos" >> $GITHUB_ENV echo "PATH=${{ env.VCPKG_ROOT }}:$PATH" >> $GITHUB_ENV vcpkg --version - ls -l ${Qt6_HOST_Dir}/../ + ls -l ${Qt6_DIR}/lib cmake -B ${{ github.workspace }}/build \ -S ${{ github.workspace }}/input-sdk \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 52ffdffe..6db03b02 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -74,6 +74,7 @@ jobs: echo "PATH=${{ env.VCPKG_ROOT }}:$PATH" >> $GITHUB_ENV vcpkg --version + ls -l ${Qt6_DIR}/lib cmake -B ${{ github.workspace }}/build \ -S ${{ github.workspace }}/input-sdk \ diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index bc6ace4c..d0157f6c 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -81,6 +81,7 @@ jobs: echo "PATH=${{ env.VCPKG_ROOT }}:$PATH" >> $GITHUB_ENV vcpkg --version + ls -l ${Qt6_DIR}/lib cmake -B ${{ github.workspace }}/build \ -S ${{ github.workspace }}/input-sdk \ diff --git a/README.md b/README.md index 8d8840e2..764cc55b 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ TODO ``` mkdir -p build/x64 cd build/x64 - export Qt6_Dir=/opt/Qt/6.5.2/macos;export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH + export Qt6_DIR=/opt/Qt/6.5.2/macos;export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH cmake -B . -S ../../input-sdk/ \ -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \ diff --git a/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake b/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake index 33e91e86..0d217dd8 100644 --- a/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake +++ b/vcpkg-overlay/ports/qt6/vcpkg-cmake-wrapper.cmake @@ -62,12 +62,12 @@ if(NOT VCPKG_TARGET_IS_IOS) endif() -set(Qt6_DIR $ENV{Qt6_Dir}/lib/cmake) +set(Qt6_DIR $ENV{Qt6_DIR}/lib/cmake) if(EXISTS ${Qt6_DIR}) MESSAGE("Using Qt6_DIR: ${Qt6_DIR}") else() - MESSAGE(FATAL_ERROR "Qt6 installation not found: ${Qt6_DIR}; Do you have Qt6_Dir environment variable set?") + MESSAGE(FATAL_ERROR "Qt6 installation not found: ${Qt6_DIR}; Do you have Qt6_DIR environment variable set?") endif() foreach(MOD ${QT_MODULES}) @@ -87,11 +87,11 @@ set(QT_HOST_MODULES ) if(VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_ANDROID) - set(Qt6_HOST_DIR $ENV{Qt6_HOST_Dir}/lib/cmake) + set(Qt6_HOST_DIR $ENV{Qt6_HOST_DIR}/lib/cmake) if(EXISTS ${Qt6_HOST_DIR}) MESSAGE("Using Qt6_HOST_DIR: ${Qt6_HOST_DIR}") else() - MESSAGE(FATAL_ERROR "Qt6 HOST installation not found: ${Qt6_HOST_DIR}; Do you have Qt6_HOST_Dir environment variable set (on android/iOS)?") + MESSAGE(FATAL_ERROR "Qt6 HOST installation not found: ${Qt6_HOST_DIR}; Do you have Qt6_HOST_DIR environment variable set (on android/iOS)?") endif() else() set(Qt6_HOST_DIR ${Qt6_DIR}) diff --git a/vcpkg-overlay/triplets/arm-android.cmake b/vcpkg-overlay/triplets/arm-android.cmake index 5197175b..82ef3d91 100644 --- a/vcpkg-overlay/triplets/arm-android.cmake +++ b/vcpkg-overlay/triplets/arm-android.cmake @@ -13,5 +13,5 @@ endif() set(VCPKG_CXX_FLAGS "-fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a") set(VCPKG_C_FLAGS "-fstack-protector-strong -lunwind -Wl,--exclude-libs=libunwind.a") -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) -set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) +set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_DIR) \ No newline at end of file diff --git a/vcpkg-overlay/triplets/arm64-android.cmake b/vcpkg-overlay/triplets/arm64-android.cmake index 7eadad03..c35345c8 100644 --- a/vcpkg-overlay/triplets/arm64-android.cmake +++ b/vcpkg-overlay/triplets/arm64-android.cmake @@ -13,5 +13,5 @@ if(DEFINED ENV{ANDROIDAPI}) set(VCPKG_CMAKE_SYSTEM_VERSION $ENV{ANDROIDAPI}) endif() -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) -set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) +set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_DIR) \ No newline at end of file diff --git a/vcpkg-overlay/triplets/arm64-ios.cmake b/vcpkg-overlay/triplets/arm64-ios.cmake index 93266150..1b173900 100644 --- a/vcpkg-overlay/triplets/arm64-ios.cmake +++ b/vcpkg-overlay/triplets/arm64-ios.cmake @@ -12,5 +12,5 @@ set(VCPKG_BUILD_TYPE release) set(VCPKG_CXX_FLAGS "-fvisibility=hidden") set(VCPKG_C_FLAGS "-fvisibility=hidden") -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) -set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) +set(VCPKG_ENV_PASSTHROUGH Qt6_HOST_DIR) \ No newline at end of file diff --git a/vcpkg-overlay/triplets/x64-linux.cmake b/vcpkg-overlay/triplets/x64-linux.cmake index 2d8c1d3c..39829fdc 100644 --- a/vcpkg-overlay/triplets/x64-linux.cmake +++ b/vcpkg-overlay/triplets/x64-linux.cmake @@ -5,4 +5,4 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_BUILD_TYPE release) -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) \ No newline at end of file diff --git a/vcpkg-overlay/triplets/x64-osx.cmake b/vcpkg-overlay/triplets/x64-osx.cmake index 8d50b3ce..fb21baa2 100644 --- a/vcpkg-overlay/triplets/x64-osx.cmake +++ b/vcpkg-overlay/triplets/x64-osx.cmake @@ -10,4 +10,4 @@ if(DEFINED ENV{DEPLOYMENT_TARGET}) set(VCPKG_OSX_DEPLOYMENT_TARGET $ENV{DEPLOYMENT_TARGET}) endif() -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) \ No newline at end of file diff --git a/vcpkg-overlay/triplets/x64-windows.cmake b/vcpkg-overlay/triplets/x64-windows.cmake index 05d9d4f4..1ebee625 100644 --- a/vcpkg-overlay/triplets/x64-windows.cmake +++ b/vcpkg-overlay/triplets/x64-windows.cmake @@ -3,4 +3,4 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_BUILD_TYPE release) -set(VCPKG_ENV_PASSTHROUGH Qt6_Dir) \ No newline at end of file +set(VCPKG_ENV_PASSTHROUGH Qt6_DIR) \ No newline at end of file