diff --git a/cmake/compilerFlags.cmake b/cmake/compilerFlags.cmake
index 82d43859..98d9c147 100644
--- a/cmake/compilerFlags.cmake
+++ b/cmake/compilerFlags.cmake
@@ -166,7 +166,7 @@ if(MSVC)
                  string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
              endif()
          endforeach()
-     endif()
+    endif()
 
     # remove /Ob2 and /Ob1 - they cause linker issues
     set(obs /Ob2 /Ob1)
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
index a1d306cc..a8946df6 100644
--- a/xmpsdk/CMakeLists.txt
+++ b/xmpsdk/CMakeLists.txt
@@ -1,35 +1,31 @@
-# CMakeLists.txt exiv2/xmpsdk
-
-# list files to be use to build XMPsdk
-set(XMPSRC src/ExpatAdapter.cpp
-           src/MD5.cpp
-           src/ParseRDF.cpp
-           src/UnicodeConversions.cpp
-           src/WXMPIterator.cpp
-           src/WXMPMeta.cpp
-           src/WXMPUtils.cpp
-           src/XML_Node.cpp
-           src/XMPCore_Impl.cpp
-           src/XMPIterator.cpp
-           src/XMPMeta-GetSet.cpp
-           src/XMPMeta-Parse.cpp
-           src/XMPMeta-Serialize.cpp
-           src/XMPMeta.cpp
-           src/XMPUtils-FileInfo.cpp
-           src/XMPUtils.cpp
-           include/MD5.h
-           include/TXMPIterator.hpp
-           include/TXMPMeta.hpp
-           include/TXMPUtils.hpp
-           include/XMP_Const.h
-           include/XMP_Environment.h
-           include/XMP.incl_cpp
-           include/XMPSDK.hpp
-           include/XMP_Version.h
+add_library(xmp STATIC
+    src/ExpatAdapter.cpp
+    src/MD5.cpp
+    src/ParseRDF.cpp
+    src/UnicodeConversions.cpp
+    src/WXMPIterator.cpp
+    src/WXMPMeta.cpp
+    src/WXMPUtils.cpp
+    src/XML_Node.cpp
+    src/XMPCore_Impl.cpp
+    src/XMPIterator.cpp
+    src/XMPMeta-GetSet.cpp
+    src/XMPMeta-Parse.cpp
+    src/XMPMeta-Serialize.cpp
+    src/XMPMeta.cpp
+    src/XMPUtils-FileInfo.cpp
+    src/XMPUtils.cpp
+    include/MD5.h
+    include/TXMPIterator.hpp
+    include/TXMPMeta.hpp
+    include/TXMPUtils.hpp
+    include/XMP_Const.h
+    include/XMP_Environment.h
+    include/XMP.incl_cpp
+    include/XMPSDK.hpp
+    include/XMP_Version.h
 )
 
-add_library(xmp STATIC ${XMPSRC})
-
 target_link_libraries(xmp 
     PRIVATE 
         ${EXPAT_LIBRARY}
@@ -59,6 +55,3 @@ install(TARGETS xmp EXPORT exiv2Config
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-
-# That's all Folks!
-##