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

microsoft · Jun 26, 2019 · 22ebb8c · 22ebb8c
1 parent fd87a08
commit 22ebb8c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 15 deletions.
diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL
@@ -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
diff --git a/ports/libmikmod/cmake_policy.patch b/ports/libmikmod/cmake_policy.patch
diff --git a/ports/libmikmod/name_conflict.patch b/ports/libmikmod/name_conflict.patch
@@ -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}
diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake
@@ -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
 )