33 files changed, 1272 insertions, 1306 deletions
diff --git a/samples/build/cmake/CMakeLists.txt b/samples/build/cmake/CMakeLists.txt
index 431e064..3361e55 100644
--- a/samples/build/cmake/CMakeLists.txt
+++ b/samples/build/cmake/CMakeLists.txt
@@ -1,33 +1,33 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
 endif(ANDROID)
 
 project(${PROJECT_NAME}64)
-
-#This projects relative path to XMP Root
-set ( XMP_THIS_PROJECT_RELATIVEPATH "../../../")
-#setting the root for XMP SDK
-if(NOT DEFINED XMP_ROOT)
-	set(XMP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${XMP_THIS_PROJECT_RELATIVEPATH})
-endif()
-
-if(NOT DEFINED COMMON_BUILD_SHARED_DIR)
-	set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared) 
-endif()
-
-set(USE_BUILDMODE_LIBNAME 0)
-
+
+#This projects relative path to XMP Root
+set ( XMP_THIS_PROJECT_RELATIVEPATH "../../../")
+#setting the root for XMP SDK
+if(NOT DEFINED XMP_ROOT)
+	set(XMP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${XMP_THIS_PROJECT_RELATIVEPATH})
+endif()
+
+if(NOT DEFINED COMMON_BUILD_SHARED_DIR)
+	set(COMMON_BUILD_SHARED_DIR ${XMP_ROOT}/build/shared) 
+endif()
+
+set(USE_BUILDMODE_LIBNAME 0)
+
 include(CMakeListsCommonSDK.txt)
 \ No newline at end of file
diff --git a/samples/build/cmake/CMakeListsCommonSDK.txt b/samples/build/cmake/CMakeListsCommonSDK.txt
index ff964d4..73f1578 100644
--- a/samples/build/cmake/CMakeListsCommonSDK.txt
+++ b/samples/build/cmake/CMakeListsCommonSDK.txt
@@ -1,77 +1,77 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE)
-#This projects relative path to XMP Root
-
-# Set the project name according to target
-if(CMAKE_CL_64)
-	set(IS64BIT "TRUE")
-	set (POSTFIX "_x64")
-	project(XMP_Samples_64)
-	message (INFO ":64 Target is chosen")
-else(CMAKE_CL_64)
-	set(IS64BIT "FALSE")
-	project(XMP_Samples)
-	message (INFO ":32 bit target is chosen")
-endif(CMAKE_CL_64)
-
-set(TESTXMP_VERSION 1.0)
-
-# setting static flag for correct compiler flag through shared config
-if(STATIC)
-set (XMP_BUILD_STATIC 1)
-else(STATIC)
-set (XMP_BUILD_STATIC 0)
-endif(STATIC)
-
-# ==============================================================================
-# load shared config
-# ==============================================================================
-include(SharedConfigSDK.cmake)
-
-# common path defines
-# setup project specific paths
-set( PROJECT_ROOT ${PROJECT_SOURCE_DIR})
-set( SAMPLE_SOURCE_ROOT ${PROJECT_ROOT}/../../source/)
-set( XMP_ROOT ${PROJECT_ROOT}/../../.. )
-set( PUBLIC_INCLUDE ${XMP_ROOT}/public/include)
-
-# Output of test executables
-set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/target/${PLATFORM_FOLDER}/)
-
-# Add the Samples to the project
-#	message (INFO ":Add CustomSchema sample")
-	add_subdirectory(${PROJECT_ROOT}/CustomSchema ${PROJECT_ROOT}/CustomSchema/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/CustomSchemaNewDOM ${PROJECT_ROOT}/CustomSchemaNewDOM/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/DumpFile ${PROJECT_ROOT}/DumpFile/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/DumpMainXMP ${PROJECT_ROOT}/DumpMainXMP/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/DumpScannedXMP ${PROJECT_ROOT}/DumpScannedXMP/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/ModifyingXMP ${PROJECT_ROOT}/ModifyingXMP/build${POSTFIX})	
-	add_subdirectory(${PROJECT_ROOT}/ModifyingXMPNewDOM ${PROJECT_ROOT}/ModifyingXMPNewDOM/build${POSTFIX})	
-	add_subdirectory(${PROJECT_ROOT}/ReadingXMP ${PROJECT_ROOT}/ReadingXMP/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/ReadingXMPNewDOM ${PROJECT_ROOT}/ReadingXMPNewDOM/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/XMPCommand ${PROJECT_ROOT}/XMPCommand/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/XMPCoreCoverage ${PROJECT_ROOT}/XMPCoreCoverage/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/XMPFilesCoverage ${PROJECT_ROOT}/XMPFilesCoverage/build${POSTFIX})
-	add_subdirectory(${PROJECT_ROOT}/XMPIterations ${PROJECT_ROOT}/XMPIterations/build${POSTFIX})
-
-message (STATUS "===========================================================================")
-message (STATUS " ${PROJECT_NAME} ")
-message (STATUS "===========================================================================")
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configurations" FORCE)
+#This projects relative path to XMP Root
+
+# Set the project name according to target
+if(CMAKE_CL_64)
+	set(IS64BIT "TRUE")
+	set (POSTFIX "_x64")
+	project(XMP_Samples_64)
+	message (INFO ":64 Target is chosen")
+else(CMAKE_CL_64)
+	set(IS64BIT "FALSE")
+	project(XMP_Samples)
+	message (INFO ":32 bit target is chosen")
+endif(CMAKE_CL_64)
+
+set(TESTXMP_VERSION 1.0)
+
+# setting static flag for correct compiler flag through shared config
+if(STATIC)
+set (XMP_BUILD_STATIC 1)
+else(STATIC)
+set (XMP_BUILD_STATIC 0)
+endif(STATIC)
+
+# ==============================================================================
+# load shared config
+# ==============================================================================
+include(SharedConfigSDK.cmake)
+
+# common path defines
+# setup project specific paths
+set( PROJECT_ROOT ${PROJECT_SOURCE_DIR})
+set( SAMPLE_SOURCE_ROOT ${PROJECT_ROOT}/../../source/)
+set( XMP_ROOT ${PROJECT_ROOT}/../../.. )
+set( PUBLIC_INCLUDE ${XMP_ROOT}/public/include)
+
+# Output of test executables
+set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/target/${PLATFORM_FOLDER}/)
+
+# Add the Samples to the project
+#	message (INFO ":Add CustomSchema sample")
+	add_subdirectory(${PROJECT_ROOT}/CustomSchema ${PROJECT_ROOT}/CustomSchema/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/CustomSchemaNewDOM ${PROJECT_ROOT}/CustomSchemaNewDOM/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/DumpFile ${PROJECT_ROOT}/DumpFile/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/DumpMainXMP ${PROJECT_ROOT}/DumpMainXMP/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/DumpScannedXMP ${PROJECT_ROOT}/DumpScannedXMP/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/ModifyingXMP ${PROJECT_ROOT}/ModifyingXMP/build${POSTFIX})	
+	add_subdirectory(${PROJECT_ROOT}/ModifyingXMPNewDOM ${PROJECT_ROOT}/ModifyingXMPNewDOM/build${POSTFIX})	
+	add_subdirectory(${PROJECT_ROOT}/ReadingXMP ${PROJECT_ROOT}/ReadingXMP/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/ReadingXMPNewDOM ${PROJECT_ROOT}/ReadingXMPNewDOM/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/XMPCommand ${PROJECT_ROOT}/XMPCommand/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/XMPCoreCoverage ${PROJECT_ROOT}/XMPCoreCoverage/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/XMPFilesCoverage ${PROJECT_ROOT}/XMPFilesCoverage/build${POSTFIX})
+	add_subdirectory(${PROJECT_ROOT}/XMPIterations ${PROJECT_ROOT}/XMPIterations/build${POSTFIX})
+
+message (STATUS "===========================================================================")
+message (STATUS " ${PROJECT_NAME} ")
+message (STATUS "===========================================================================")
+
+
diff --git a/samples/build/cmake/CustomSchema/CMakeLists.txt b/samples/build/cmake/CustomSchema/CMakeLists.txt
index 7de7988..faaf454 100644
--- a/samples/build/cmake/CustomSchema/CMakeLists.txt
+++ b/samples/build/cmake/CustomSchema/CMakeLists.txt
@@ -1,87 +1,87 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (CustomSchema)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchema.cpp )
-source_group("Source Files" FILES ${SOURCE_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})     
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )  
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-	
-#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (CustomSchema)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchema.cpp )
+source_group("Source Files" FILES ${SOURCE_FILES})
+include_directories( ${XMP_ROOT} )
+include_directories( ${PUBLIC_INCLUDE} )
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})     
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )  
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+	
+#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
diff --git a/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt b/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt
index 70b7724..508bab7 100644
--- a/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt
+++ b/samples/build/cmake/CustomSchemaNewDOM/CMakeLists.txt
@@ -1,94 +1,94 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (CustomSchemaNewDOM)
-
-# ==============================================================================
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-else(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
-	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
-	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
-	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-       			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-
-#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (CustomSchemaNewDOM)
+
+# ==============================================================================
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+if(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+else(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/CustomSchemaNewDOM.cpp )
+	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
+	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
+	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
+endif(STATIC)
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+       			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+
+#message (STATUS "Output Folder -> ${OUTPUT_DIR}")
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
diff --git a/samples/build/cmake/DumpFile/CMakeListsCommon.txt b/samples/build/cmake/DumpFile/CMakeListsCommon.txt
index 66ba46b..a06d804 100644
--- a/samples/build/cmake/DumpFile/CMakeListsCommon.txt
+++ b/samples/build/cmake/DumpFile/CMakeListsCommon.txt
@@ -1,75 +1,75 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-
-source_group("Source Files" FILES ${SOURCE_FILES})
-source_group("Common Files" FILES ${COMMON_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+
+source_group("Source Files" FILES ${SOURCE_FILES})
+source_group("Common Files" FILES ${COMMON_FILES})
+include_directories( ${XMP_ROOT} )
+include_directories( ${PUBLIC_INCLUDE} )
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
diff --git a/samples/build/cmake/DumpMainXMP/CMakeLists.txt b/samples/build/cmake/DumpMainXMP/CMakeLists.txt
index bdb6352..9984172 100644
--- a/samples/build/cmake/DumpMainXMP/CMakeLists.txt
+++ b/samples/build/cmake/DumpMainXMP/CMakeLists.txt
@@ -1,85 +1,85 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project ( DumpMainXMP )
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpMainXMP.cpp )
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES})
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project ( DumpMainXMP )
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpMainXMP.cpp )
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/DumpScannedXMP/CMakeLists.txt b/samples/build/cmake/DumpScannedXMP/CMakeLists.txt
index bbdf1f3..6970c9a 100644
--- a/samples/build/cmake/DumpScannedXMP/CMakeLists.txt
+++ b/samples/build/cmake/DumpScannedXMP/CMakeLists.txt
@@ -1,87 +1,87 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (DumpScannedXMP)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpScannedXMP.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})   
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-    endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})   
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-    endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (DumpScannedXMP)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/DumpScannedXMP.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})   
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+    endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})   
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+    endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/ModifyingXMP/CMakeLists.txt b/samples/build/cmake/ModifyingXMP/CMakeLists.txt
index 26d1e09..bd163bb 100644
--- a/samples/build/cmake/ModifyingXMP/CMakeLists.txt
+++ b/samples/build/cmake/ModifyingXMP/CMakeLists.txt
@@ -1,88 +1,88 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ModifyingXMP)
-
-# ==============================================================================
-
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-	
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMP.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})  
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )     
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (ModifyingXMP)
+
+# ==============================================================================
+
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+	
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMP.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})  
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )     
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt
index 93e7f50..cb50a41 100644
--- a/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt
+++ b/samples/build/cmake/ModifyingXMPNewDOM/CMakeLists.txt
@@ -1,94 +1,94 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ModifyingXMPNewDOM)
-
-# ==============================================================================
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-else(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
-	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
-	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
-	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		                
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )		
-	endif(UNIX)
-endif(STATIC)
-
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (ModifyingXMPNewDOM)
+
+# ==============================================================================
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+if(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+else(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ModifyingXMPNewDOM.cpp)
+	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
+	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
+	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
+endif(STATIC)
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})       
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		                
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )		
+	endif(UNIX)
+endif(STATIC)
+
+
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/ReadingXMP/CMakeLists.txt b/samples/build/cmake/ReadingXMP/CMakeLists.txt
index cb5ec36..e042d81 100644
--- a/samples/build/cmake/ReadingXMP/CMakeLists.txt
+++ b/samples/build/cmake/ReadingXMP/CMakeLists.txt
@@ -1,88 +1,88 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ReadingXMP)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMP.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-	
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-    if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (ReadingXMP)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMP.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+
+	
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+    if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt b/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt
index d506981..2599385 100644
--- a/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt
+++ b/samples/build/cmake/ReadingXMPNewDOM/CMakeLists.txt
@@ -1,95 +1,95 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (ReadingXMPNewDOM)
-
-# ==============================================================================
-
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-if(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-else(STATIC)
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
-	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
-	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
-	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
-endif(STATIC)
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#adding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (ReadingXMPNewDOM)
+
+# ==============================================================================
+
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+if(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+else(STATIC)
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/ReadingXMPNewDOM.cpp)
+	file (GLOB CORE_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCore/source/*.cpp)
+	file (GLOB COMMON_PUBLIC_SOURCE_FILES ${XMP_ROOT}/public/include/XMPCommon/source/*.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	source_group("Source Files\\Public\\XMPCore" FILES ${CORE_PUBLIC_SOURCE_FILES})
+	source_group("Source Files\\Public\\XMPCommon" FILES ${COMMON_PUBLIC_SOURCE_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CORE_PUBLIC_SOURCE_FILES} ${COMMON_PUBLIC_SOURCE_FILES})
+endif(STATIC)
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#adding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/XMPCommand/CMakeListsCommon.txt b/samples/build/cmake/XMPCommand/CMakeListsCommon.txt
index 478519d..22cc1f1 100644
--- a/samples/build/cmake/XMPCommand/CMakeListsCommon.txt
+++ b/samples/build/cmake/XMPCommand/CMakeListsCommon.txt
@@ -1,80 +1,80 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPCommand)
-
-
-source_group("Source Files" FILES ${SOURCE_FILES})
-source_group("Common Files" FILES ${COMMON_FILES})
-include_directories( ${XMP_ROOT} )
-include_directories( ${PUBLIC_INCLUDE} )
-
-add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (XMPCommand)
+
+
+source_group("Source Files" FILES ${SOURCE_FILES})
+source_group("Common Files" FILES ${COMMON_FILES})
+include_directories( ${XMP_ROOT} )
+include_directories( ${PUBLIC_INCLUDE} )
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${COMMON_FILES})
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt b/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt
index 321dc1c..7e51548 100644
--- a/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt
+++ b/samples/build/cmake/XMPCoreCoverage/CMakeLists.txt
@@ -1,85 +1,85 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPCoreCoverage)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPCoreCoverage.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (XMPCoreCoverage)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPCoreCoverage.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt b/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt
index 749300a..58c015a 100644
--- a/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt
+++ b/samples/build/cmake/XMPFilesCoverage/CMakeLists.txt
@@ -1,85 +1,85 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPFilesCoverage)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPFilesCoverage.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (XMPFilesCoverage)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPFilesCoverage.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/cmake/XMPIterations/CMakeLists.txt b/samples/build/cmake/XMPIterations/CMakeLists.txt
index 61f177c..39d865c 100644
--- a/samples/build/cmake/XMPIterations/CMakeLists.txt
+++ b/samples/build/cmake/XMPIterations/CMakeLists.txt
@@ -1,86 +1,86 @@
-# =================================================================================================
-# ADOBE SYSTEMS INCORPORATED
-# Copyright 2013 Adobe Systems Incorporated
-# All Rights Reserved
-#
-# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
-# of the Adobe license agreement accompanying it.
-# =================================================================================================
-
-# define minimum cmake version
-# For Android always build with make 3.6
-if(ANDROID)
-	cmake_minimum_required(VERSION 3.5.2)
-else(ANDROID)
-	cmake_minimum_required(VERSION 3.15.5)
-endif(ANDROID)
-
-# ==============================================================================
-# Adding Project Name
-# ==============================================================================
-project (XMPIterations)
-
-# ==============================================================================
-if(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=1)
-else(STATIC)
-add_definitions(-DENABLE_CPP_DOM_MODEL=0)
-endif(STATIC)
-
-	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPIterations.cpp)
-	source_group("Source Files" FILES ${SOURCE_FILES})
-	source_group("Common Files" FILES ${COMMON_FILES})
-	include_directories( ${XMP_ROOT} )
-	include_directories( ${PUBLIC_INCLUDE} )
-	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
-
-#setting up XMP_BUILDMODE_DIR variable
-SetupInternalBuildDirectory()
-set (BUILD_MODE_LIBNAME "")
-if (USE_BUILDMODE_LIBNAME ) 
-	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
-endif()
-#addding XMP libs and setting output path
-if(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-	endif(UNIX)
-else(STATIC)
-	if(UNIX)
-		if(APPLE) #For Mac
-			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-		else(APPLE) #For Linux
-			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
-			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
-			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
-			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
-			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )			
-		endif(APPLE)	
-	else(UNIX) #For Windows
-		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
-		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
-		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
-		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
-	endif(UNIX)
-endif(STATIC)
-#adding Cocoa for Mac
-ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
-
-
-
+# =================================================================================================
+# ADOBE SYSTEMS INCORPORATED
+# Copyright 2013 Adobe Systems Incorporated
+# All Rights Reserved
+#
+# NOTICE: Adobe permits you to use, modify, and distribute this file in accordance with the terms
+# of the Adobe license agreement accompanying it.
+# =================================================================================================
+
+# define minimum cmake version
+# For Android always build with make 3.6
+if(ANDROID)
+	cmake_minimum_required(VERSION 3.5.2)
+else(ANDROID)
+	cmake_minimum_required(VERSION 3.15.5)
+endif(ANDROID)
+
+# ==============================================================================
+# Adding Project Name
+# ==============================================================================
+project (XMPIterations)
+
+# ==============================================================================
+if(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=1)
+else(STATIC)
+add_definitions(-DENABLE_CPP_DOM_MODEL=0)
+endif(STATIC)
+
+	file (GLOB SOURCE_FILES ${SAMPLE_SOURCE_ROOT}/XMPIterations.cpp)
+	source_group("Source Files" FILES ${SOURCE_FILES})
+	source_group("Common Files" FILES ${COMMON_FILES})
+	include_directories( ${XMP_ROOT} )
+	include_directories( ${PUBLIC_INCLUDE} )
+	add_executable(${PROJECT_NAME} ${SOURCE_FILES} )
+
+#setting up XMP_BUILDMODE_DIR variable
+SetupInternalBuildDirectory()
+set (BUILD_MODE_LIBNAME "")
+if (USE_BUILDMODE_LIBNAME ) 
+	set(BUILD_MODE_LIBNAME ${XMP_BUILDMODE_DIR})
+endif()
+#addding XMP libs and setting output path
+if(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/lib${XMPFILES_LIB}Static${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}Static${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}Static${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+	endif(UNIX)
+else(STATIC)
+	if(UNIX)
+		if(APPLE) #For Mac
+			target_link_libraries(${PROJECT_NAME}  ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT}/Versions/A/${XMPCORE_LIB} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT}/Versions/A/${XMPFILES_LIB})
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+		else(APPLE) #For Linux
+			SetPlatformLinkFlags(${PROJECT_NAME} "" "")
+			target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} )
+			set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ) 
+			set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})		
+			add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR} )			
+		endif(APPLE)	
+	else(UNIX) #For Windows
+		target_link_libraries(${PROJECT_NAME} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPCORE_LIB}${LIB_EXT} ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR}/${XMPFILES_LIB}${LIB_EXT} Rpcrt4.lib)	
+		set(OUTPUT_DIR ${SAMPLE_SOURCE_ROOT}/../target/${PLATFORM_FOLDER}/ ) 
+		set(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+		add_custom_command (TARGET ${PROJECT_NAME} COMMAND ${CMAKE_COMMAND} -E copy_directory ${XMP_ROOT}/public/libraries/${PLATFORM_FOLDER}/${XMP_BUILDMODE_DIR} ${OUTPUT_DIR}/${XMP_BUILDMODE_DIR} )
+	endif(UNIX)
+endif(STATIC)
+#adding Cocoa for Mac
+ADD_FRAMEWORK(Cocoa ${PROJECT_NAME})
+
+
+
diff --git a/samples/build/readme.txt b/samples/build/readme.txt
index 98c4aad..5583b74 100644
--- a/samples/build/readme.txt
+++ b/samples/build/readme.txt
@@ -1,20 +1,20 @@
-Building Sample Projects:
-
-Windows:
-
-1. Double Click "GenerateSamples_win.bat" or run it through command prompt.
-2. Enter the type of project to create
-3. The project files will be created in vc14\windows or vc14\windows_x64 folder
-
-Mac:
-
-1. Run the shell script GenerateSamples_mac.sh.
-2. Enter the type of project to create
-3. The project files will be created in xcode\intel_64 folder
-
-Linux:
-
-1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the samples. Also all the sample will be build automatically.
-2. All the sample projects makefiles will be created in gcc folder.
-3. All the sample will be built in ../target folder.
-4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well.
+Building Sample Projects:
+
+Windows:
+
+1. Double Click "GenerateSamples_win.bat" or run it through command prompt.
+2. Enter the type of project to create
+3. The project files will be created in vc14\windows or vc14\windows_x64 folder
+
+Mac:
+
+1. Run the shell script GenerateSamples_mac.sh.
+2. Enter the type of project to create
+3. The project files will be created in xcode\intel_64 folder
+
+Linux:
+
+1. Run the Makefile. This Makefile will call cmake to generate the makefile for all the samples. Also all the sample will be build automatically.
+2. All the sample projects makefiles will be created in gcc folder.
+3. All the sample will be built in ../target folder.
+4. Make sure the gcc location is added to $PATH and its libraries location to $LD_LIBRARY_PATH. There is a need to add libuuid.so library path to the $LD_LIBRARY_PATH as well.
diff --git a/samples/source/CustomSchema.cpp b/samples/source/CustomSchema.cpp
index 9994cbd..4d285f2 100644
--- a/samples/source/CustomSchema.cpp
+++ b/samples/source/CustomSchema.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/CustomSchemaNewDOM.cpp b/samples/source/CustomSchemaNewDOM.cpp
index c1428ad..0f1a22c 100644
--- a/samples/source/CustomSchemaNewDOM.cpp
+++ b/samples/source/CustomSchemaNewDOM.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/DumpMainXMP.cpp b/samples/source/DumpMainXMP.cpp
index bf21274..c97d7ac 100644
--- a/samples/source/DumpMainXMP.cpp
+++ b/samples/source/DumpMainXMP.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/DumpScannedXMP.cpp b/samples/source/DumpScannedXMP.cpp
index 9d7e65e..f14f0dc 100644
--- a/samples/source/DumpScannedXMP.cpp
+++ b/samples/source/DumpScannedXMP.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/ModifyingXMP.cpp b/samples/source/ModifyingXMP.cpp
index df5c86f..0794d7c 100644
--- a/samples/source/ModifyingXMP.cpp
+++ b/samples/source/ModifyingXMP.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/ModifyingXMPNewDOM.cpp b/samples/source/ModifyingXMPNewDOM.cpp
index 73f5fb3..9ff2ebf 100644
--- a/samples/source/ModifyingXMPNewDOM.cpp
+++ b/samples/source/ModifyingXMPNewDOM.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/ReadingXMP.cpp b/samples/source/ReadingXMP.cpp
index c312535..c73df06 100644
--- a/samples/source/ReadingXMP.cpp
+++ b/samples/source/ReadingXMP.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/ReadingXMPNewDOM.cpp b/samples/source/ReadingXMPNewDOM.cpp
index 99d636a..5f7c16a 100644
--- a/samples/source/ReadingXMPNewDOM.cpp
+++ b/samples/source/ReadingXMPNewDOM.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/XMPCoreCoverage.cpp b/samples/source/XMPCoreCoverage.cpp
index 291bd27..7bb9f89 100644
--- a/samples/source/XMPCoreCoverage.cpp
+++ b/samples/source/XMPCoreCoverage.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/XMPFilesCoverage.cpp b/samples/source/XMPFilesCoverage.cpp
index 216369f..360a3a7 100644
--- a/samples/source/XMPFilesCoverage.cpp
+++ b/samples/source/XMPFilesCoverage.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/XMPIterations.cpp b/samples/source/XMPIterations.cpp
index 2ad2182..8b37946 100644
--- a/samples/source/XMPIterations.cpp
+++ b/samples/source/XMPIterations.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**
diff --git a/samples/source/dumpfile/main.cpp b/samples/source/dumpfile/main.cpp
index 847f2d7..9f670ed 100644
--- a/samples/source/dumpfile/main.cpp
+++ b/samples/source/dumpfile/main.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 //
 // 
diff --git a/samples/source/xmpcommand/Actions.cpp b/samples/source/xmpcommand/Actions.cpp
index c8848f5..a99a597 100644
--- a/samples/source/xmpcommand/Actions.cpp
+++ b/samples/source/xmpcommand/Actions.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 // actions.cpp|h
diff --git a/samples/source/xmpcommand/Actions.h b/samples/source/xmpcommand/Actions.h
index f820f70..b0ab055 100644
--- a/samples/source/xmpcommand/Actions.h
+++ b/samples/source/xmpcommand/Actions.h
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #ifndef __ACTIONS_h__
diff --git a/samples/source/xmpcommand/PrintUsage.cpp b/samples/source/xmpcommand/PrintUsage.cpp
index 833721f..10a96a3 100644
--- a/samples/source/xmpcommand/PrintUsage.cpp
+++ b/samples/source/xmpcommand/PrintUsage.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #include "samples/source/common/globals.h"
diff --git a/samples/source/xmpcommand/PrintUsage.h b/samples/source/xmpcommand/PrintUsage.h
index 4d5b7a6..97f742b 100644
--- a/samples/source/xmpcommand/PrintUsage.h
+++ b/samples/source/xmpcommand/PrintUsage.h
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 #ifndef __XMPQE_PRINT_USAGE_h__
diff --git a/samples/source/xmpcommand/XMPCommand.cpp b/samples/source/xmpcommand/XMPCommand.cpp
index 5ab4fdb..aecadd6 100644
--- a/samples/source/xmpcommand/XMPCommand.cpp
+++ b/samples/source/xmpcommand/XMPCommand.cpp
@@ -3,9 +3,7 @@
 // All Rights Reserved.
 //
 // NOTICE:  Adobe permits you to use, modify, and distribute this file in accordance with the terms
-// of the Adobe license agreement accompanying it. If you have received this file from a source other 
-// than Adobe, then your use, modification, or distribution of it requires the prior written permission
-// of Adobe.
+// of the Adobe license agreement accompanying it. 
 // =================================================================================================
 
 /**