2018-07-01 23:12:24 +01:00
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
2020-06-03 03:03:58 +01:00
Date: Tue, 2 Jun 2020 18:18:40 +1000
Subject: [PATCH 1/2] Install pkg-config file on MINGW also
2018-07-01 23:12:24 +01:00
2020-06-03 03:03:58 +01:00
Mingw follows unix conventions and often expects pkg-config files to be present.
see: https://github.com/facebook/zstd/pull/2183
2018-07-01 23:12:24 +01:00
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 1111111..2222222 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
2020-05-24 09:29:38 +01:00
@@ -134,7 +134,7 @@ if (ZSTD_BUILD_STATIC)
2018-07-01 23:12:24 +01:00
OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME})
2019-01-05 13:20:42 +00:00
endif ()
2018-07-01 23:12:24 +01:00
2019-01-05 13:20:42 +00:00
-if (UNIX)
+if (UNIX OR MINGW)
2018-07-01 23:12:24 +01:00
# pkg-config
2019-01-05 13:20:42 +00:00
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
2020-05-24 09:29:38 +01:00
set(LIBDIR "${CMAKE_INSTALL_LIBDIR}")
2020-06-03 03:03:58 +01:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Tue, 2 Jun 2020 19:23:40 +1000
Subject: [PATCH 2/2] Install runtime components (i.e. DLLs) to BINDIR
The convention on windows-based systems (including mingw and cygwin) is to install DLLs in a `.../bin` directory. These [cmake target types](https://cmake.org/cmake/help/latest/command/install.html#installing-targets) handle the various shared, static, and import libraries across systems in a predictable way.
see: https://github.com/facebook/zstd/pull/2185
diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt
index 1111111..2222222 100644
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@ -163,6 +163,7 @@ install(TARGETS ${library_targets}
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
)
# uninstall target