Merge pull request #1247 from agarny/issue1243

Code generator: use different arrays for constants, computed constants, and algebraic variables

Author: nickerso

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

@@ -121,6 +121,7 @@ set(MODULE_HEADER_FILES
 )
 
 set(GIT_HEADER_FILES
+  ${CMAKE_CURRENT_SOURCE_DIR}/analyser_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/analyserequation_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/analyserequationast_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/analyserexternalvariable_p.h
@@ -133,6 +134,7 @@ 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}/generatorprofile_p.h
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofilesha1values.h
   ${CMAKE_CURRENT_SOURCE_DIR}/generatorprofiletools.h
   ${CMAKE_CURRENT_SOURCE_DIR}/internaltypes.h
@@ -196,13 +198,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 +234,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