From 36e12a4f37fc743dbfa0029aa2da2f7ac3e48b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Thu, 10 Aug 2017 19:39:58 +0200 Subject: [PATCH] Add XML_STATIC definition in xmp library to fix problems finding symbols. Link always with EXPAT_LIBARIES --- xmpsdk/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt index 278f5407..04b76411 100644 --- a/xmpsdk/CMakeLists.txt +++ b/xmpsdk/CMakeLists.txt @@ -31,18 +31,14 @@ IF( EXIV2_ENABLE_XMP AND EXIV2_ENABLE_LIBXMP ) check_include_file( "stdint.h" EXV_HAVE_STDINT_H ) ADD_LIBRARY( xmp STATIC ${XMPSRC} ) + target_compile_definitions(xmp PUBLIC XML_STATIC) target_include_directories(xmp PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include) if (EXV_HAVE_STDINT_H) target_compile_definitions(xmp PRIVATE EXV_HAVE_STDINT_H) endif() - GET_TARGET_PROPERTY( XMPLIB xmp LOCATION ) - if ( NOT MSVC ) - TARGET_LINK_LIBRARIES(xmp ${EXPAT_LIBRARIES}) - else() - TARGET_LINK_LIBRARIES(xmp ${CMAKE_THREAD_LIBS_INIT} ${EXPAT_LIBRARIES}) - endif() + TARGET_LINK_LIBRARIES(xmp ${EXPAT_LIBRARIES}) # 1119 Install libxmp.a for use by third party applications (Thanks, Emmanuel) INSTALL(TARGETS xmp ${INSTALL_TARGET_STANDARD_ARGS} ) ENDIF()