[avisynthplus] fix clang-cl/intel with ninja generator (#26092)

* avisynthplus fix for clang-cl

* v db
This commit is contained in:
Alexander Neumann 2022-08-04 01:00:49 +02:00 committed by GitHub
parent 14ce35f452
commit 6a29f32abb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 2 deletions

View File

@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d60332e63..0216970fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,7 +188,15 @@ endif()
endif()
ENDIF()
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+ set(CLANG_IN_VS "1")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+ set(IntelLLVM_IN_VS "1")
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+ set(IntelClassic_IN_VS "1")
+ endif()
+
IF(CLANG_IN_VS STREQUAL "1")
#these are unknown
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")

View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF v3.7.2
SHA512 82cf2afed4cc53c0e09d367ff3df1db0e9ac17ff2458e4660c646430d8e72f472b072a3910c9595b26eb5ac89c82fe74699acab3869014f87d8e2738b81568a1
HEAD_REF master
PATCHES
clang-cl.patch # the normal lookup is not working since it doesn't take Ninja as a Generator into account
)
vcpkg_download_distfile(GHC_ARCHIVE

View File

@ -1,6 +1,7 @@
{
"name": "avisynthplus",
"version-semver": "3.7.2",
"version": "3.7.2",
"port-version": 1,
"description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
"homepage": "https://avs-plus.net/",
"license": "GPL-2.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "10f62c32226c4f588e4524ebe1ffc36a2ad2165a",
"version": "3.7.2",
"port-version": 1
},
{
"git-tree": "e3749b45c163c78cdd03a7e47223634ba17ab58f",
"version-semver": "3.7.2",

View File

@ -254,7 +254,7 @@
},
"avisynthplus": {
"baseline": "3.7.2",
"port-version": 0
"port-version": 1
},
"avro-c": {
"baseline": "1.11.0",