File minizip2-noconflict.patch of Package minizip2
Index: minizip-2.9.1/CMakeLists.txt
===================================================================
--- minizip-2.9.1.orig/CMakeLists.txt
+++ minizip-2.9.1/CMakeLists.txt
@@ -52,10 +52,10 @@ include(FeatureSummary)
set(INSTALL_BIN_DIR ${CMAKE_INSTALL_FULL_BINDIR} CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR ${CMAKE_INSTALL_FULL_LIBDIR} CACHE PATH "Installation directory for libraries")
-set(INSTALL_INC_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR} CACHE PATH "Installation directory for headers")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}" CACHE PATH "Installation directory for headers")
set(INSTALL_MAN_DIR ${CMAKE_INSTALL_FULL_MANDIR} CACHE PATH "Installation directory for manual pages")
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
-set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/minizip" CACHE PATH "Installation directory for cmake files.")
+set(INSTALL_CMAKE_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/cmake/minizip-2" CACHE PATH "Installation directory for cmake files.")
set(MINIZIP_PC ${CMAKE_CURRENT_BINARY_DIR}/minizip.pc)
configure_file(minizip.pc.cmakein ${MINIZIP_PC} @ONLY)
@@ -621,7 +621,7 @@ endmacro()
# Create minizip library
source_group("Minizip" FILES ${MINIZIP_SRC} ${MINIZIP_PUBLIC_HEADERS})
-project(minizip)
+project(minizip-2)
add_library(${PROJECT_NAME}
${MINIZIP_SRC} ${MINIZIP_PUBLIC_HEADERS}
@@ -690,7 +690,7 @@ target_include_directories(${PROJECT_NAM
# Install files
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL)
install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}
- INCLUDES DESTINATION "${INSTALL_INC_DIR}"
+ INCLUDES DESTINATION "${INSTALL_INC_DIR}/${PROJECT_NAME}"
RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
LIBRARY DESTINATION "${INSTALL_LIB_DIR}")
@@ -699,10 +699,10 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SK
NAMESPACE "MINIZIP::")
endif()
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
- install(FILES ${MINIZIP_PUBLIC_HEADERS} DESTINATION "${INSTALL_INC_DIR}")
+ install(FILES ${MINIZIP_PUBLIC_HEADERS} DESTINATION "${INSTALL_INC_DIR}/${PROJECT_NAME}")
endif()
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL)
- install(FILES ${MINIZIP_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
+ install(FILES ${MINIZIP_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}" RENAME "${PROJECT_NAME}.pc")
endif()
# Build test executables
@@ -915,4 +915,4 @@ add_feature_info(MZ_BUILD_UNIT_TEST MZ_B
add_feature_info(MZ_BUILD_FUZZ_TEST MZ_BUILD_FUZZ_TEST "Builds minizip fuzzer executables")
add_feature_info(MZ_CODE_COVERAGE MZ_CODE_COVERAGE "Builds with code coverage flags")
-feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES INCLUDE_QUIET_PACKAGES)
\ No newline at end of file
+feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES INCLUDE_QUIET_PACKAGES)
Index: minizip-2.9.1/minizip.pc.cmakein
===================================================================
--- minizip-2.9.1.orig/minizip.pc.cmakein
+++ minizip-2.9.1/minizip.pc.cmakein
@@ -4,10 +4,10 @@ libdir=@INSTALL_LIB_DIR@
sharedlibdir=@INSTALL_LIB_DIR@
includedir=@INSTALL_INC_DIR@
-Name: minizip
+Name: minizip-2
Description: Minizip zip file manipulation library
Version: @VERSION@
Requires: zlib
-Libs: -L${libdir} -L${sharedlibdir} -lminizip
-Cflags: -I${includedir}
+Libs: -L${libdir} -L${sharedlibdir} -lminizip-2
+Cflags: -I${includedir}/minizip-2