diff --git a/sdf/1.10/CMakeLists.txt b/sdf/1.10/CMakeLists.txt
index 787bde7ea..0b26feafd 100644
--- a/sdf/1.10/CMakeLists.txt
+++ b/sdf/1.10/CMakeLists.txt
@@ -75,11 +75,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_10 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.11/CMakeLists.txt b/sdf/1.11/CMakeLists.txt
index 0091cc9c6..9a99a64a4 100644
--- a/sdf/1.11/CMakeLists.txt
+++ b/sdf/1.11/CMakeLists.txt
@@ -77,11 +77,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_11 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.12/CMakeLists.txt b/sdf/1.12/CMakeLists.txt
index 2aa996610..9d02c42bf 100644
--- a/sdf/1.12/CMakeLists.txt
+++ b/sdf/1.12/CMakeLists.txt
@@ -78,11 +78,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_12 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.5/CMakeLists.txt b/sdf/1.5/CMakeLists.txt
index c4a1f021f..7d78c577d 100644
--- a/sdf/1.5/CMakeLists.txt
+++ b/sdf/1.5/CMakeLists.txt
@@ -69,11 +69,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_5 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.6/CMakeLists.txt b/sdf/1.6/CMakeLists.txt
index 2984383fe..ef478dc89 100644
--- a/sdf/1.6/CMakeLists.txt
+++ b/sdf/1.6/CMakeLists.txt
@@ -73,11 +73,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_6 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.7/CMakeLists.txt b/sdf/1.7/CMakeLists.txt
index 684fc78fd..7b4f4d482 100644
--- a/sdf/1.7/CMakeLists.txt
+++ b/sdf/1.7/CMakeLists.txt
@@ -74,11 +74,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_7 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.8/CMakeLists.txt b/sdf/1.8/CMakeLists.txt
index a73150286..65bce5294 100644
--- a/sdf/1.8/CMakeLists.txt
+++ b/sdf/1.8/CMakeLists.txt
@@ -76,11 +76,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_8 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)
diff --git a/sdf/1.9/CMakeLists.txt b/sdf/1.9/CMakeLists.txt
index 1a7d9ce59..18ae149ef 100644
--- a/sdf/1.9/CMakeLists.txt
+++ b/sdf/1.9/CMakeLists.txt
@@ -76,11 +76,22 @@ foreach(FIL ${sdfs})
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.xsd"
     COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     ARGS --sdf-dir ${CMAKE_CURRENT_SOURCE_DIR} --input-file ${ABS_FIL} --output-dir ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${ABS_FIL}
+    DEPENDS ${ABS_FIL} ${CMAKE_SOURCE_DIR}/tools/xmlschema.py
     COMMENT "Running xml schema compiler on ${FIL}"
     VERBATIM)
 endforeach()
 
+add_custom_command(
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  COMMAND ${CMAKE_COMMAND} -E copy
+    "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+    "${CMAKE_CURRENT_BINARY_DIR}/types.xsd"
+  DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/schema/types.xsd"
+  COMMENT "Copying types.xsd to binary dir"
+  VERBATIM)
+
+list(APPEND SDF_SCHEMA "${CMAKE_CURRENT_BINARY_DIR}/types.xsd")
+
 add_custom_target(schema1_9 ALL DEPENDS ${SDF_SCHEMA})
 
 set_source_files_properties(${SDF_SCHEMA} PROPERTIES GENERATED TRUE)