From 35c244e91148cd3cf75c0197a5852d942e725eaa Mon Sep 17 00:00:00 2001
From: clanmills <robin@clanmills.com>
Date: Thu, 14 Sep 2017 17:42:28 +0100
Subject: [PATCH] AdobeXMPsdk.  Revert most of xmpsdk/CMakeLists.txt to enable
 debugging with Xcode.

---
 config/config.h.cmake |  4 +++-
 xmpsdk/CMakeLists.txt | 40 +++++++++++++++++-----------------------
 xmpsdk/include/MD5.h  |  2 +-
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/config/config.h.cmake b/config/config.h.cmake
index 7e4ed424..f481a88c 100644
--- a/config/config.h.cmake
+++ b/config/config.h.cmake
@@ -1,6 +1,8 @@
 // File generated by cmake from config/config.h.cmake.
 
 #pragma once
+#ifndef _EXV_CONF_H_
+#define _EXV_CONF_H_
 
 // Defined if you want to use libssh for SshIO.
 #cmakedefine EXV_USE_SSH
@@ -171,6 +173,6 @@
 
 #endif /* !EXV_COMMERCIAL_VERSION */
 // ------------------------------------------------------------------
-
+#endif /* !_EXV_CONF_H_ */
 // That's All Folks!
 // ------------------------------------------------------------------
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index 48258bfe..aa564d0f 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -9,35 +9,29 @@ foreach(_currentfile ${XMPSRC})
     endif()
 endforeach()
 
-# CMake OBJECT LIBRARY (collection of object files)
-add_library( xmp_object OBJECT ${XMPSRC} )
-
-target_include_directories(xmp_object PRIVATE ${EXPAT_INCLUDE_DIR})
-target_include_directories(xmp_object PRIVATE ${CMAKE_SOURCE_DIR}/xmpsdk/include)
-
-check_include_file( "stdint.h"  EXV_HAVE_STDINT_H )
-if (EXV_HAVE_STDINT_H)
-    target_compile_definitions(xmp_object PUBLIC EXV_HAVE_STDINT_H)
+if(NOT MSVC)
+  # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang
+  if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
+    # 1123 - hide xmpsdk symbols
+    add_definitions( -fvisibility=hidden -fvisibility-inlines-hidden )
+  endif()
 endif()
 
-if( EXIV2_ENABLE_LIBXMP )
-    add_library(xmp STATIC $<TARGET_OBJECTS:xmp_object>)
-    target_link_libraries(xmp PUBLIC ${EXPAT_LIBRARIES})
-    target_include_directories(xmp PUBLIC ${EXPAT_INCLUDE_DIR})
-    target_include_directories(xmp PUBLIC ${CMAKE_SOURCE_DIR}/xmpsdk/include)
+add_library( xmp STATIC ${XMPSRC} )
+target_include_directories(xmp PUBLIC ${CMAKE_SOURCE_DIR}/xmpsdk/include)
+target_include_directories(xmp PUBLIC ${EXPAT_INCLUDE_DIR})
 
-    # http://stackoverflow.com/questions/10046114/in-cmake-how-can-i-test-if-the-compiler-is-clang
-    if ( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang")
-        # 1123 - hide xmpsdk symbols
-        target_compile_definitions(xmp PRIVATE -fvisibility=hidden -fvisibility-inlines-hidden )
-    endif()
+if ( NOT MSVC )
+    target_link_libraries(xmp ${EXPAT_LIBRARIES})
+else()
+    target_link_libraries(xmp Threads::Threads ${EXPAT_LIBRARIES})
+endif()
 
-    # 1119  Install libxmp.a for use by third party applications (Thanks, Emmanuel)
-    install(TARGETS xmp
+# 1119  Install libxmp.a for use by third party applications (Thanks, Emmanuel)
+install(TARGETS xmp
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    )
-endif()
+)
 
 # That's all Folks!
 ##
diff --git a/xmpsdk/include/MD5.h b/xmpsdk/include/MD5.h
index f6c5e783..dd35d8ba 100644
--- a/xmpsdk/include/MD5.h
+++ b/xmpsdk/include/MD5.h
@@ -34,7 +34,7 @@
 # endif
 #endif
 
-#if defined(EXV_HAVE_STDINT_H) || defined(__MINGW32__) || defined(__MING64__)
+#if defined(EXV_HAVE_STDINT_H) || defined(__MINGW32__) || defined(__MING64__) || defined(__APPLE__)
 # include <stdint.h>
 #endif