Skip to content

Commit

Permalink
Merge pull request #5316 from AenBleidd/vko_fix_android_build
Browse files Browse the repository at this point in the history
[CI] Fix paths for renamed vcpkg triplet files
  • Loading branch information
AenBleidd authored Jul 30, 2023
2 parents d674ab3 + d92d62a commit aef1b9f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.

include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/arm-neon-android.cmake)
include(${VCPKG_ROOT}/triplets/arm-neon-android.cmake)

set(VCPKG_CMAKE_SYSTEM_VERSION android-16)
2 changes: 1 addition & 1 deletion 3rdParty/vcpkg_ports/triplets/default/arm64-android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.

include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/arm64-android.cmake)
include(${VCPKG_ROOT}/triplets/arm64-android.cmake)

set(VCPKG_CMAKE_SYSTEM_VERSION android-21)
2 changes: 1 addition & 1 deletion 3rdParty/vcpkg_ports/triplets/default/x64-android.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# along with BOINC. If not, see <http://www.gnu.org/licenses/>.

include(${CMAKE_CURRENT_LIST_DIR}/../../vcpkg_root_find.cmake)
include(${VCPKG_ROOT}/triplets/community/x64-android.cmake)
include(${VCPKG_ROOT}/triplets/x64-android.cmake)

set(VCPKG_CMAKE_SYSTEM_VERSION android-21)

0 comments on commit aef1b9f

Please sign in to comment.