mirror of https://github.com/microsoft/vcpkg.git
[yasm] Revise patches (#52812)
This commit is contained in:
parent
7c3ebc6fe3
commit
97b19caab9
|
|
@ -1,11 +1,23 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8df871c..2eafe3f 100644
|
||||
index 8df871c..a8f93b8 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,5 +1,5 @@
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
|
||||
PROJECT(yasm)
|
||||
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
|
||||
+CMAKE_MINIMUM_REQUIRED(VERSION 3.5)
|
||||
if (COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 NEW)
|
||||
endif (COMMAND cmake_policy)
|
||||
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
|
||||
index 4b05d04..3b9971a 100644
|
||||
--- a/ConfigureChecks.cmake
|
||||
+++ b/ConfigureChecks.cmake
|
||||
@@ -34,7 +34,6 @@ CONFIGURE_FILE(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||
|
||||
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
|
||||
|
||||
-INCLUDE(FindPythonInterp)
|
||||
IF (NOT PYTHON_EXECUTABLE)
|
||||
MESSAGE(FATAL_ERROR "Could not find Python executable")
|
||||
ENDIF (NOT PYTHON_EXECUTABLE)
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ vcpkg_cmake_configure(
|
|||
"-DPYTHON_EXECUTABLE=${PYTHON3}"
|
||||
-DENABLE_NLS=OFF
|
||||
-DYASM_BUILD_TESTS=OFF
|
||||
OPTIONS_DEBUG
|
||||
-DBUILD_TOOLS=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "yasm",
|
||||
"version": "1.3.0",
|
||||
"port-version": 7,
|
||||
"port-version": 8,
|
||||
"description": "Yasm is a complete rewrite of the NASM assembler under the new BSD License.",
|
||||
"homepage": "https://github.com/yasm/yasm",
|
||||
"license": "BSD-2-Clause OR BSD-3-Clause OR Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only",
|
||||
|
|
|
|||
|
|
@ -11234,7 +11234,7 @@
|
|||
},
|
||||
"yasm": {
|
||||
"baseline": "1.3.0",
|
||||
"port-version": 7
|
||||
"port-version": 8
|
||||
},
|
||||
"yasm-tool-helper": {
|
||||
"baseline": "2020-03-11",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "1799613977de95ba7e902626cb2e7d8f07fb8f00",
|
||||
"version": "1.3.0",
|
||||
"port-version": 8
|
||||
},
|
||||
{
|
||||
"git-tree": "aae36f033e868ed60d6894f260e7b5ee515089b6",
|
||||
"version": "1.3.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue