mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-22 18:47:09 +01:00
[libmikmod] resolve ninja error (-w dupbuild=err) (#7052)
This commit is contained in:
parent
fd87a081bb
commit
22ebb8ca68
@ -1,5 +1,5 @@
|
|||||||
Source: libmikmod
|
Source: libmikmod
|
||||||
Version: 3.3.11.1-3
|
Version: 3.3.11.1-4
|
||||||
Homepage: https://sourceforge.net/projects/mikmod/
|
Homepage: https://sourceforge.net/projects/mikmod/
|
||||||
Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.
|
Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.
|
||||||
Build-Depends: openal-soft
|
Build-Depends: openal-soft
|
||||||
|
@ -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")
|
|
13
ports/libmikmod/name_conflict.patch
Normal file
13
ports/libmikmod/name_conflict.patch
Normal 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}
|
@ -23,9 +23,15 @@ vcpkg_extract_source_archive_ex(
|
|||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-missing-dll.patch
|
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(
|
vcpkg_configure_cmake(
|
||||||
SOURCE_PATH ${SOURCE_PATH}
|
SOURCE_PATH ${SOURCE_PATH}
|
||||||
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
PREFER_NINJA # Disable this option if project cannot be built with Ninja
|
||||||
@ -42,6 +48,7 @@ vcpkg_configure_cmake(
|
|||||||
-DENABLE_STDOUT=ON
|
-DENABLE_STDOUT=ON
|
||||||
-DENABLE_WAV=ON
|
-DENABLE_WAV=ON
|
||||||
-DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
|
-DOPENAL_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include
|
||||||
|
-DENABLE_STATIC=${ENABLE_STATIC}
|
||||||
OPTIONS_RELEASE -DENABLE_SIMD=ON
|
OPTIONS_RELEASE -DENABLE_SIMD=ON
|
||||||
OPTIONS_DEBUG -DENABLE_SIMD=OFF
|
OPTIONS_DEBUG -DENABLE_SIMD=OFF
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user