diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:27:05 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2019-03-14 22:27:05 +0100 |
| commit | 9f41fed1724fa8a7939066232f37d0a5bd62ccfb (patch) | |
| tree | bb036637ff655b7781dd7cfd42a115bd4eac5873 /ports/szip/disable-static-lib-in-shared-build.patch | |
| parent | bdc5d538a59e4983ab184d65963bac2678d35947 (diff) | |
| download | vcpkg-9f41fed1724fa8a7939066232f37d0a5bd62ccfb.tar.gz vcpkg-9f41fed1724fa8a7939066232f37d0a5bd62ccfb.zip | |
default szip to also build static libraries in shared builds
Diffstat (limited to 'ports/szip/disable-static-lib-in-shared-build.patch')
| -rw-r--r-- | ports/szip/disable-static-lib-in-shared-build.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/ports/szip/disable-static-lib-in-shared-build.patch b/ports/szip/disable-static-lib-in-shared-build.patch deleted file mode 100644 index 02110cb2a..000000000 --- a/ports/szip/disable-static-lib-in-shared-build.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/src/CMakeLists.txt Fri Feb 03 20:42:43 2017 -+++ b/src/CMakeLists.txt Wed Jan 03 11:42:51 2018 -@@ -22,20 +22,22 @@ - ${SZIP_SRC_SOURCE_DIR}/szlib.h - ) - --add_library (${SZIP_LIB_TARGET} STATIC ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS}) --#set_target_properties (${SZIP_LIB_TARGET} --# PROPERTIES --# LINK_FLAGS "-version-info 2:0:0" --#) --TARGET_C_PROPERTIES (${SZIP_LIB_TARGET} STATIC " " " ") --target_link_libraries (${SZIP_LIB_TARGET} ${LINK_LIBS}) --set_target_properties(${SZIP_LIB_TARGET} PROPERTIES -- PUBLIC_HEADER "${SZIP_PUBLIC_HEADERS}" -- INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" --) --set_global_variable (SZIP_LIBRARIES_TO_EXPORT ${SZIP_LIB_TARGET}) --SZIP_SET_LIB_OPTIONS (${SZIP_LIB_TARGET} ${SZIP_LIB_NAME} STATIC) --set (install_targets ${SZIP_LIB_TARGET}) -+if (NOT BUILD_SHARED_LIBS) -+ add_library (${SZIP_LIB_TARGET} STATIC ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS}) -+ #set_target_properties (${SZIP_LIB_TARGET} -+ # PROPERTIES -+ # LINK_FLAGS "-version-info 2:0:0" -+ #) -+ TARGET_C_PROPERTIES (${SZIP_LIB_TARGET} STATIC " " " ") -+ target_link_libraries (${SZIP_LIB_TARGET} ${LINK_LIBS}) -+ set_target_properties(${SZIP_LIB_TARGET} PROPERTIES -+ PUBLIC_HEADER "${SZIP_PUBLIC_HEADERS}" -+ INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" -+ ) -+ set_global_variable (SZIP_LIBRARIES_TO_EXPORT ${SZIP_LIB_TARGET}) -+ SZIP_SET_LIB_OPTIONS (${SZIP_LIB_TARGET} ${SZIP_LIB_NAME} STATIC) -+ set (install_targets ${SZIP_LIB_TARGET}) -+endif() - - if (BUILD_SHARED_LIBS) - add_library (${SZIP_LIBSH_TARGET} SHARED ${SZIP_SRCS} ${SZIP_PUBLIC_HEADERS}) -@@ -62,8 +64,9 @@ - if (SZIP_EXPORTED_TARGETS) - if (BUILD_SHARED_LIBS) - INSTALL_TARGET_PDB (${SZIP_LIBSH_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries) -+ else() -+ INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries) - endif (BUILD_SHARED_LIBS) -- INSTALL_TARGET_PDB (${SZIP_LIB_TARGET} ${SZIP_INSTALL_BIN_DIR} libraries) - - install ( - TARGETS |