diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-06-26 16:03:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 16:03:13 -0700 |
| commit | 22ebb8ca681ed2dffbf931cf2ad72d53b846f2e2 (patch) | |
| tree | e52c51bef327dea61b2c934bbeaafdd01985bf76 | |
| parent | fd87a081bb6acc33ec4e581f1ce60edcad80eda1 (diff) | |
| download | vcpkg-22ebb8ca681ed2dffbf931cf2ad72d53b846f2e2.tar.gz vcpkg-22ebb8ca681ed2dffbf931cf2ad72d53b846f2e2.zip | |
[libmikmod] resolve ninja error (-w dupbuild=err) (#7052)
| -rw-r--r-- | ports/libmikmod/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmikmod/cmake_policy.patch | 13 | ||||
| -rw-r--r-- | ports/libmikmod/name_conflict.patch | 13 | ||||
| -rw-r--r-- | ports/libmikmod/portfile.cmake | 9 |
4 files changed, 22 insertions, 15 deletions
diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL index 6a02a4ae4..bc289f59c 100644 --- 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 deleted file mode 100644 index 17d48278a..000000000 --- a/ports/libmikmod/cmake_policy.patch +++ /dev/null @@ -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")
diff --git a/ports/libmikmod/name_conflict.patch b/ports/libmikmod/name_conflict.patch new file mode 100644 index 000000000..be0ba1d28 --- /dev/null +++ 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 index 1ec5d6773..ef0b6d5e0 100644 --- 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 ) |