mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 23:58:03 +08:00
c867e68ca8
* Format manifest, make port version explicit
* Use standard mingw import lib names
* Choose either static or shared binaries
* Insert macro for dynamic linkage
* Add szip pc file
* Quote path expressions
* Port away from deprecated cmake functions
* x-add-version
* Begin of hdf5 changes
* Remove obsolete variables (complements 23eadeae)
* Fix indentation and quoting expressions
* Handle single-linkage szip configuration
* Use mingw import lib names for hdf5
* Move dependencies to Requires in pc file
* Port away from deprecated cmake functions
* x-add-version hdf5
* Apply szip review comments
* Update version
* Improve pkgconfig patch to handle lists
* Update git-tree
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
diff -urN a/config/cmake/SZIPMacros.cmake b/config/cmake/SZIPMacros.cmake
|
|
--- a/config/cmake/SZIPMacros.cmake 2021-05-15 09:06:50.546455249 +0200
|
|
+++ b/config/cmake/SZIPMacros.cmake 2021-05-15 09:01:24.933765423 +0200
|
|
@@ -126,7 +126,7 @@
|
|
macro (SZIP_SET_BASE_OPTIONS libtarget libname libtype)
|
|
# message (STATUS "${libname} libtype: ${libtype}")
|
|
if (${libtype} MATCHES "SHARED")
|
|
- if (WIN32)
|
|
+ if (WIN32 AND NOT MINGW)
|
|
set (LIB_RELEASE_NAME "${libname}")
|
|
set (LIB_DEBUG_NAME "${libname}_D")
|
|
else ()
|
|
@@ -134,7 +134,7 @@
|
|
set (LIB_DEBUG_NAME "${libname}_debug")
|
|
endif ()
|
|
else ()
|
|
- if (WIN32)
|
|
+ if (WIN32 AND NOT MINGW)
|
|
set (LIB_RELEASE_NAME "lib${libname}")
|
|
set (LIB_DEBUG_NAME "lib${libname}_D")
|
|
else ()
|
|
@@ -164,7 +164,7 @@
|
|
endif ()
|
|
|
|
#----- Use MSVC Naming conventions for Shared Libraries
|
|
- if (MINGW AND ${libtype} MATCHES "SHARED")
|
|
+ if (FALSE AND MINGW AND ${libtype} MATCHES "SHARED")
|
|
set_target_properties (${libtarget}
|
|
PROPERTIES
|
|
IMPORT_SUFFIX ".lib"
|