[libmikmod] resolve ninja error (-w dupbuild=err) (#7052)

This commit is contained in:
Phil Christensen 2019-06-26 16:03:13 -07:00 committed by GitHub
parent fd87a081bb
commit 22ebb8ca68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 15 deletions

View File

@ -1,5 +1,5 @@
Source: libmikmod
Version: 3.3.11.1-3
Version: 3.3.11.1-4
Homepage: https://sourceforge.net/projects/mikmod/
Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.
Build-Depends: openal-soft

View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4d31d3..67951e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,8 @@
#
# (This copyright notice applies only to this file)
+cmake_policy(SET CMP0003 NEW)
+
PROJECT(libmikmod C)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
LIST(APPEND CMAKE_MODULE_PATH "${libmikmod_SOURCE_DIR}/cmake")

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53a174e..5983882 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,7 +404,7 @@ IF (ENABLE_STATIC)
SET_TARGET_PROPERTIES(
mikmod-static
- PROPERTIES OUTPUT_NAME "mikmod"
+ PROPERTIES OUTPUT_NAME "mikmod-static"
)
SET_TARGET_PROPERTIES(
${LIBMIKMOD_LIBS}

View File

@ -23,9 +23,15 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
PATCHES
fix-missing-dll.patch
cmake_policy.patch
name_conflict.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(ENABLE_STATIC ON)
else()
set(ENABLE_STATIC OFF)
endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
@ -42,6 +48,7 @@ vcpkg_configure_cmake(
-DENABLE_STDOUT=ON
-DENABLE_WAV=ON
-DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
-DENABLE_STATIC=${ENABLE_STATIC}
OPTIONS_RELEASE -DENABLE_SIMD=ON
OPTIONS_DEBUG -DENABLE_SIMD=OFF
)