Reorganise our code in preparation for our work on the interpreter

CMakeLists.txt

@@ -249,8 +249,10 @@ if(CLANG_FORMAT_AVAILABLE)
     ${SOURCE_FILES}
     ${HEADER_FILES}
     ${CONFIG_FILES}
-    ${TESTS_HEADER_FILES}
+    ${DEBUG_SOURCE_FILES}
+    ${DEBUG_HEADER_FILES}
     ${TESTS_SOURCE_FILES}
+    ${TESTS_HEADER_FILES}
   )
 
   set(CHECK_CODE_FORMATTING_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/cmake_command_check_code_formatting.cmake)

cmake/common.cmake

@@ -313,3 +313,13 @@ function(redhat_based _RESULT)
   endif()
   set(${_RESULT} ${_REDHAT_BASED} PARENT_SCOPE)
 endfunction()
+
+function(apply_libxml2_settings _TARGET)
+  if(HAVE_LIBXML2_CONFIG)
+    target_link_libraries(${_TARGET} PUBLIC ${LIBXML2_TARGET_NAME})
+  else()
+    target_include_directories(${_TARGET} PUBLIC ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
+    target_link_libraries(${_TARGET} PUBLIC ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
+    target_compile_definitions(${_TARGET} PUBLIC ${LIBXML2_DEFINITIONS})
+  endif()
+endfunction()

src/CMakeLists.txt

@@ -49,6 +49,7 @@ set(SOURCE_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/entity.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/enums.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/generator.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/generatorinterpreter.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofile.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofiletools.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/importedentity.cpp
@@ -133,6 +134,9 @@ set(GIT_HEADER_FILES
   ${CMAKE_CURRENT_SOURCE_DIR}/debug.h
   ${CMAKE_CURRENT_SOURCE_DIR}/entity_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/generator_p.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generatorinterpreter_p.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generatorinterpreter.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofile_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofilesha1values.h
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofiletools.h
   ${CMAKE_CURRENT_SOURCE_DIR}/internaltypes.h
@@ -196,13 +200,7 @@ else()
   target_include_directories(cellml PUBLIC ${ZLIB_INCLUDE_DIRS})
 endif()
 
-if(HAVE_LIBXML2_CONFIG)
-  target_link_libraries(cellml PUBLIC ${LIBXML2_TARGET_NAME})
-else()
-  target_include_directories(cellml PUBLIC ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS})
-  target_link_libraries(cellml PUBLIC ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
-  target_compile_definitions(cellml PUBLIC ${LIBXML2_DEFINITIONS})
-endif()
+apply_libxml2_settings(cellml)
 
 # Use target compile features to propagate features to consuming projects.
 target_compile_features(cellml PUBLIC cxx_std_17)
@@ -238,6 +236,8 @@ target_include_directories(cellml_debug_utilities
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api>
 )
 
+apply_libxml2_settings(cellml_debug_utilities)
+
 set_target_properties(cellml_debug_utilities PROPERTIES
   CXX_VISIBILITY_PRESET hidden
   DEBUG_POSTFIX d
@@ -389,3 +389,6 @@ set(CONFIG_FILES
   ${LIBCELLML_VERSIONCONFIG_H_IN}
   PARENT_SCOPE
 )
+
+set(DEBUG_SOURCE_FILES ${DEBUG_SOURCE_FILES} PARENT_SCOPE)
+set(DEBUG_HEADER_FILES ${DEBUG_HEADER_FILES} PARENT_SCOPE)