Skip to content

[quirc, opencv4] Build fixes from 2021-01-18 build #15788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 15 commits into from
Jan 26, 2021
Merged

[quirc, opencv4] Build fixes from 2021-01-18 build #15788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d683d97
[quirc, opencv4] Use a cmake package for quirc and devendor quirc fro…
BillyONeal Jan 21, 2021
6c3dc67
Build fixes from 2020-01-18 build
BillyONeal Jan 21, 2021
9b7fe60
Fixup spurious / and format-manifest.
BillyONeal Jan 21, 2021
c2a5a5e
x-add-version
BillyONeal Jan 21, 2021
26f0603
Add missing =fails.
BillyONeal Jan 21, 2021
ad19d54
Merge remote-tracking branch 'origin/master' into build_fixes
BillyONeal Jan 25, 2021
1268aa2
Update opencv4 devendor patch for 4.5
BillyONeal Jan 26, 2021
9748912
Transform quirc into a feature.
BillyONeal Jan 26, 2021
95d41c1
Repeat changes for opencv3.
BillyONeal Jan 26, 2021
9a6bcd1
Repeat for opencv. Also fix version for "opencv".
BillyONeal Jan 26, 2021
b5cb7ed
[dxut] Use vcpkg_from_github, correct "supports",
BillyONeal Jan 26, 2021
65354e3
[epsilon] Skip in ci.baseline.txt for now because it has "vcpkg_check…
BillyONeal Jan 26, 2021
14a88de
Fix flipped supports:
BillyONeal Jan 26, 2021
5bccc05
Update ports/opencv3/portfile.cmake
strega-nil Jan 26, 2021
6c56b09
x-add-version
BillyONeal Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ports/dxut/CONTROL
View file
Open in desktop

This file was deleted.

51 changes: 21 additions & 30 deletions ports/dxut/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

if(NOT VCPKG_CRT_LINKAGE STREQUAL "dynamic")
message(FATAL_ERROR "DXUT only supports dynamic CRT linkage")
endif()

vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/Microsoft/DXUT/archive/sept2016.tar.gz"
FILENAME "DXUT-sept2016.tar.gz"
SHA512 190006c194284a1f5d614477896b0469a59ece05dff37477dadbe98808a5c33e274c0c1bb1390f22d1b5e06c9f534f4b50d6002157b2a391e01c2192b8e08869
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
vcpkg_fail_port_install(ON_ARCH arm)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/DXUT
REF d6e8ef60b35b8d3b97684bd6b3cee88f8ba81a3f
SHA512 2ac1ac4416dbf7ae0e8a9e1e95fbd8bede126ac6dc4e919f4bd1131d10f3a01e007aff2f770ace9cbf48093ff76d8b89c4b78b734658028be62e1412f44078ae
)

IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
Expand All @@ -22,31 +15,29 @@ ELSE()
ENDIF()

vcpkg_build_msbuild(
PROJECT_PATH ${SOURCE_PATH}/DXUT_2015.sln
PLATFORM ${BUILD_ARCH}
PROJECT_PATH "${SOURCE_PATH}/DXUT_2015.sln"
PLATFORM "${BUILD_ARCH}"
)

file(INSTALL
${SOURCE_PATH}/Core/
${SOURCE_PATH}/Optional/
DESTINATION ${CURRENT_PACKAGES_DIR}/include
"${SOURCE_PATH}/Core/"
"${SOURCE_PATH}/Optional/"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
FILES_MATCHING PATTERN "*.h"
)
file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/include/Bin)
"${CURRENT_PACKAGES_DIR}/include/Bin")

file(INSTALL
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib
${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib"
"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib"
DESTINATION "${CURRENT_PACKAGES_DIR}/lib")

file(INSTALL
${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib
${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib"
"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib"
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")

vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/dxut RENAME copyright)

message(STATUS "Installing done")
file(INSTALL "${SOURCE_PATH}/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
8 changes: 8 additions & 0 deletions ports/dxut/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "dxut",
"version-string": "11.14",
"port-version": 4,
"description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
"homepage": "https://github.com/Microsoft/DXUT",
"supports": "!staticcrt & windows & !arm"
}
107 changes: 0 additions & 107 deletions ports/opencv/CONTROL
View file
Open in desktop

This file was deleted.

Loading