The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6977 from NNemec/mesonbuild-cmake_prefix_path

Browse Source 
set cmake_prefix_path correctly within vcpkg_configure_meson
This commit is contained in:
Griffin Downs 2019-06-24 15:00:22 -07:00 committed by GitHub
commit 62861ea301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/cmake/vcpkg_configure_meson.cmake
View File

@ -26,6 +26,7 @@ function(vcpkg_configure_meson)
set(MESON_RELEASE_LDFLAGS "${MESON_RELEASE_LDFLAGS} /INCREMENTAL:NO /OPT:REF /OPT:ICF")
# select meson cmd-line options
list(APPEND _vcm_OPTIONS -Dcmake_prefix_path=${CURRENT_INSTALLED_DIR})
list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
list(APPEND _vcm_OPTIONS --default-library shared)

8
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -154,10 +154,10 @@ function(vcpkg_find_acquire_program VAR)
else()
set(SCRIPTNAME meson)
endif()
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.50.0)
set(URL "https://github.com/mesonbuild/meson/archive/0.50.0.zip")
set(ARCHIVE "meson-0.50.0.zip")
set(HASH 587cafe0cd551e3fb3507ecab904912dc3e053aa95c864b435526a20d52406536ba970a50be6c9f20d83314c5853aaefa102c5ca14623d0928b091a43e7b6d64)
set(PATHS ${DOWNLOADS}/tools/meson/meson-0.51.0)
set(URL "https://github.com/mesonbuild/meson/archive/0.51.0.zip")
set(ARCHIVE "meson-0.51.0.zip")
set(HASH bf1df65cde7e0e0a44e4b4be7d68de9897a77c4ea4c694f1d77fe82cd3c7e7818dc034a3313ce885ba6883b4ba6d282b7a589f665fa499d9eb79fc7a23e415cc)
elseif(VAR MATCHES "FLEX")
if(CMAKE_HOST_WIN32)
set(PROGNAME win_flex)