Build: static lib dependency for ICU (#281)
* Fix missed path for generated files in #277 * Update cmake to include char conversion dependency on static library
This commit is contained in:
parent
7ada1c974c
commit
022303bbc9
@ -725,6 +725,14 @@ IF(VMIME_CHARSETCONV_LIB STREQUAL "iconv")
|
|||||||
)
|
)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
IF(VMIME_BUILD_STATIC_LIBRARY)
|
||||||
|
TARGET_LINK_LIBRARIES(
|
||||||
|
${VMIME_LIBRARY_NAME}-static
|
||||||
|
${TARGET_LINK_LIBRARIES}
|
||||||
|
${ICONV_LIBRARIES}
|
||||||
|
)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICONV_LIBRARIES}")
|
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICONV_LIBRARIES}")
|
||||||
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${ICONV_INCLUDE_DIR}")
|
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${ICONV_INCLUDE_DIR}")
|
||||||
|
|
||||||
@ -747,6 +755,14 @@ ELSEIF(VMIME_CHARSETCONV_LIB STREQUAL "icu")
|
|||||||
)
|
)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
IF(VMIME_BUILD_STATIC_LIBRARY)
|
||||||
|
TARGET_LINK_LIBRARIES(
|
||||||
|
${VMIME_LIBRARY_NAME}-static
|
||||||
|
${TARGET_LINK_LIBRARIES}
|
||||||
|
${ICU_LIBRARIES}
|
||||||
|
)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICU_LIBRARIES}")
|
SET(VMIME_PKGCONFIG_LIBS "${VMIME_PKGCONFIG_LIBS} ${ICU_LIBRARIES}")
|
||||||
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${ICU_INCLUDE_DIRS}")
|
SET(VMIME_PKGCONFIG_CFLAGS "${VMIME_PKGCONFIG_CFLAGS} -I${ICU_INCLUDE_DIRS}")
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user