mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:29:08 +08:00
9e853cf17c
* Add KF5Config * Add KF5WidgetsAddons * Add KF5Completion * Add KF5CoreAddons * Add KF5WindowSystem * Add KF5GuiAddons * Add KF5ItemModels * Add KF5ItemViews * Add KF5i18n * Initial attempt to port quazip * Fixed Quazip post installation checks * Fixed linux builds * Fixed x64-linux dynamic builds * Temporary patch for KF5Completion until fixed in upstream * Add Vc * Add libde265 * Add libheif * Don't build examples and gdk pixbuf for libheif * Add KF5Crash * Fix windows builds * Add gettext as a dependency of kf5i18n * Formatting changes applied * Add homepages of all the ports * Removed deprecated functions * Fix quazip builds for x64-windows-static triplet * Put support directives and fixed windows static builds * Fix KF5Archive branch * fixing libheif for unix systems * Some linux specific changes * Apply suggestions to kde frameworks * Update quazip patch as suggested
31 lines
2.0 KiB
Diff
31 lines
2.0 KiB
Diff
diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt
|
|
index 1efb5e2..2412b8a 100644
|
|
--- a/quazip/CMakeLists.txt
|
|
+++ b/quazip/CMakeLists.txt
|
|
@@ -10,22 +10,13 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD)
|
|
qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS})
|
|
set(SRCS ${SRCS} ${MOC_SRCS})
|
|
|
|
-add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS})
|
|
-add_library(quazip_static STATIC ${SRCS})
|
|
-
|
|
-# Windows uses .lib extension for both static and shared library
|
|
-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name
|
|
-if (NOT WIN32)
|
|
- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX})
|
|
-endif ()
|
|
+add_library(${QUAZIP_LIB_TARGET_NAME} ${SRCS})
|
|
|
|
target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
|
|
-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
|
|
-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
|
|
+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d)
|
|
|
|
# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
|
|
target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
|
|
-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES})
|
|
|
|
install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
|
|
-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION})
|
|
+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|