mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-14 09:09:02 +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.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff -urw a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
|
|
--- a/config/cmake_ext_mod/HDFMacros.cmake 2020-03-03 00:03:12.000000000 +0100
|
|
+++ b/config/cmake_ext_mod/HDFMacros.cmake 2021-05-12 07:56:13.703041807 +0200
|
|
@@ -144,7 +144,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"
|
|
IMPORT_PREFIX ""
|
|
@@ -168,7 +168,7 @@
|
|
|
|
if (${libtype} MATCHES "SHARED")
|
|
if (WIN32)
|
|
- if (MINGW)
|
|
+ if (FALSE AND MINGW)
|
|
set_target_properties (${libtarget} PROPERTIES
|
|
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
|
|
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|
|
@@ -180,7 +180,7 @@
|
|
)
|
|
endif ()
|
|
else ()
|
|
- if (MINGW)
|
|
+ if (FALSE AND MINGW)
|
|
set_target_properties (${libtarget} PROPERTIES
|
|
IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
|
|
IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
|