Merge branch 'check_esm4_compilation' into 'master'

Check ESM4 compilation See merge request OpenMW/openmw!1677
2025-01-29 18:32:36 +00:00 · 2022-02-19 12:18:43 +00:00 · 2022-02-19 12:18:43 +00:00 · 1c1581bdab
commit 1c1581bdab
parent fd2b2e4871 57c1f2e231
4 changed files with 181 additions and 81 deletions
--- a/apps/openmw_test_suite/CMakeLists.txt
+++ b/apps/openmw_test_suite/CMakeLists.txt
@ -72,6 +72,8 @@ if (GTEST_FOUND AND GMOCK_FOUND)
        files/hash.cpp

        toutf8/toutf8.cpp
+
+        esm4/includes.cpp
    )

    source_group(apps\\openmw_test_suite FILES openmw_test_suite.cpp ${UNITTEST_SRC_FILES})
--- a/apps/openmw_test_suite/esm4/includes.cpp
+++ b/apps/openmw_test_suite/esm4/includes.cpp
@ -0,0 +1,89 @@
+#include <components/esm4/acti.hpp>
+#include <components/esm4/actor.hpp>
+#include <components/esm4/common.hpp>
+#include <components/esm4/dialogue.hpp>
+#include <components/esm4/effect.hpp>
+#include <components/esm4/formid.hpp>
+#include <components/esm4/inventory.hpp>
+#include <components/esm4/lighting.hpp>
+#include <components/esm4/loadachr.hpp>
+#include <components/esm4/loadacre.hpp>
+#include <components/esm4/loadalch.hpp>
+#include <components/esm4/loadaloc.hpp>
+#include <components/esm4/loadammo.hpp>
+#include <components/esm4/loadanio.hpp>
+#include <components/esm4/loadappa.hpp>
+#include <components/esm4/loadarma.hpp>
+#include <components/esm4/loadarmo.hpp>
+#include <components/esm4/loadaspc.hpp>
+#include <components/esm4/loadbook.hpp>
+#include <components/esm4/loadbptd.hpp>
+#include <components/esm4/loadcell.hpp>
+#include <components/esm4/loadclas.hpp>
+#include <components/esm4/loadclfm.hpp>
+#include <components/esm4/loadclot.hpp>
+#include <components/esm4/loadcont.hpp>
+#include <components/esm4/loadcrea.hpp>
+#include <components/esm4/loaddial.hpp>
+#include <components/esm4/loaddobj.hpp>
+#include <components/esm4/loaddoor.hpp>
+#include <components/esm4/loadeyes.hpp>
+#include <components/esm4/loadflor.hpp>
+#include <components/esm4/loadflst.hpp>
+#include <components/esm4/loadfurn.hpp>
+#include <components/esm4/loadglob.hpp>
+#include <components/esm4/loadgras.hpp>
+#include <components/esm4/loadgrup.hpp>
+#include <components/esm4/loadhair.hpp>
+#include <components/esm4/loadhdpt.hpp>
+#include <components/esm4/loadidle.hpp>
+#include <components/esm4/loadidlm.hpp>
+#include <components/esm4/loadimod.hpp>
+#include <components/esm4/loadinfo.hpp>
+#include <components/esm4/loadingr.hpp>
+#include <components/esm4/loadkeym.hpp>
+#include <components/esm4/loadland.hpp>
+#include <components/esm4/loadlgtm.hpp>
+#include <components/esm4/loadligh.hpp>
+#include <components/esm4/loadltex.hpp>
+#include <components/esm4/loadlvlc.hpp>
+#include <components/esm4/loadlvli.hpp>
+#include <components/esm4/loadlvln.hpp>
+#include <components/esm4/loadmato.hpp>
+#include <components/esm4/loadmisc.hpp>
+#include <components/esm4/loadmset.hpp>
+#include <components/esm4/loadmstt.hpp>
+#include <components/esm4/loadmusc.hpp>
+#include <components/esm4/loadnavi.hpp>
+#include <components/esm4/loadnavm.hpp>
+#include <components/esm4/loadnote.hpp>
+#include <components/esm4/loadnpc.hpp>
+#include <components/esm4/loadotft.hpp>
+#include <components/esm4/loadpack.hpp>
+#include <components/esm4/loadpgrd.hpp>
+#include <components/esm4/loadpgre.hpp>
+#include <components/esm4/loadpwat.hpp>
+#include <components/esm4/loadqust.hpp>
+#include <components/esm4/loadrace.hpp>
+#include <components/esm4/loadrefr.hpp>
+#include <components/esm4/loadregn.hpp>
+#include <components/esm4/loadroad.hpp>
+#include <components/esm4/loadsbsp.hpp>
+#include <components/esm4/loadscol.hpp>
+#include <components/esm4/loadscpt.hpp>
+#include <components/esm4/loadscrl.hpp>
+#include <components/esm4/loadsgst.hpp>
+#include <components/esm4/loadslgm.hpp>
+#include <components/esm4/loadsndr.hpp>
+#include <components/esm4/loadsoun.hpp>
+#include <components/esm4/loadstat.hpp>
+#include <components/esm4/loadtact.hpp>
+#include <components/esm4/loadterm.hpp>
+#include <components/esm4/loadtes4.hpp>
+#include <components/esm4/loadtree.hpp>
+#include <components/esm4/loadtxst.hpp>
+#include <components/esm4/loadweap.hpp>
+#include <components/esm4/loadwrld.hpp>
+#include <components/esm4/reader.hpp>
+#include <components/esm4/reference.hpp>
+#include <components/esm4/script.hpp>
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -95,13 +95,96 @@ add_component_dir (esm3terrain
    )

 add_component_dir (esm4
-    loadachr loadacre loadacti loadalch loadaloc loadammo loadanio loadappa loadarma loadarmo loadaspc loadbook
-    loadbptd loadcell loadclas loadclfm loadclot common loadcont loadcrea loaddial loaddobj loaddoor loadeyes
-    loadflor loadflst formid loadfurn loadglob loadgras loadhair loadhdpt loadidle loadidlm loadimod loadinfo
-    loadingr loadkeym loadland loadlgtm loadligh loadltex loadlvlc loadlvli loadlvln loadmato loadmisc loadmset
-    loadmstt loadmusc loadnavi loadnavm loadnote loadnpc loadotft loadpack loadpgrd loadpgre loadpwat loadqust
-    loadrace loadrefr loadregn loadroad loadsbsp loadscol loadscpt loadscrl loadsgst loadslgm loadsndr
-    loadsoun loadstat loadtact loadterm loadtes4 loadtree loadtxst loadweap loadwrld reader
+    acti
+    actor
+    common
+    dialogue
+    effect
+    formid
+    inventory
+    lighting
+    loadachr
+    loadacre
+    loadacti
+    loadalch
+    loadaloc
+    loadammo
+    loadanio
+    loadappa
+    loadarma
+    loadarmo
+    loadaspc
+    loadbook
+    loadbptd
+    loadcell
+    loadclas
+    loadclfm
+    loadclot
+    loadcont
+    loadcrea
+    loaddial
+    loaddobj
+    loaddoor
+    loadeyes
+    loadflor
+    loadflst
+    loadfurn
+    loadglob
+    loadgras
+    loadgrup
+    loadhair
+    loadhdpt
+    loadidle
+    loadidlm
+    loadimod
+    loadinfo
+    loadingr
+    loadkeym
+    loadland
+    loadlgtm
+    loadligh
+    loadltex
+    loadlvlc
+    loadlvli
+    loadlvln
+    loadmato
+    loadmisc
+    loadmset
+    loadmstt
+    loadmusc
+    loadnavi
+    loadnavm
+    loadnote
+    loadnpc
+    loadotft
+    loadpack
+    loadpgrd
+    loadpgre
+    loadpwat
+    loadqust
+    loadrace
+    loadrefr
+    loadregn
+    loadroad
+    loadsbsp
+    loadscol
+    loadscpt
+    loadscrl
+    loadsgst
+    loadslgm
+    loadsndr
+    loadsoun
+    loadstat
+    loadtact
+    loadterm
+    loadtes4
+    loadtree
+    loadtxst
+    loadweap
+    loadwrld
+    reader
+    reference
+    script
 )

 add_component_dir (misc
--- a/components/esm4/records.hpp
+++ b/components/esm4/records.hpp
@ -1,74 +0,0 @@
-#ifndef ESM4_RECORDS_H
-#define ESM4_RECORDS_H
-
-#include <extern/esm4/hair.hpp>
-#include <extern/esm4/eyes.hpp>
-#include <extern/esm4/race.hpp>
-#include <extern/esm4/achr.hpp>
-#include <extern/esm4/acre.hpp>
-#include <extern/esm4/soun.hpp>
-#include <extern/esm4/ltex.hpp>
-#include <extern/esm4/acti.hpp>
-#include <extern/esm4/appa.hpp>
-#include <extern/esm4/armo.hpp>
-#include <extern/esm4/book.hpp>
-#include <extern/esm4/clot.hpp>
-#include <extern/esm4/cont.hpp>
-#include <extern/esm4/door.hpp>
-#include <extern/esm4/ingr.hpp>
-#include <extern/esm4/ligh.hpp>
-#include <extern/esm4/misc.hpp>
-#include <extern/esm4/stat.hpp>
-#include <extern/esm4/gras.hpp>
-#include <extern/esm4/tree.hpp>
-#include <extern/esm4/flor.hpp>
-#include <extern/esm4/furn.hpp>
-#include <extern/esm4/weap.hpp>
-#include <extern/esm4/ammo.hpp>
-#include <extern/esm4/npc_.hpp>
-#include <extern/esm4/crea.hpp>
-#include <extern/esm4/lvlc.hpp>
-#include <extern/esm4/slgm.hpp>
-#include <extern/esm4/keym.hpp>
-#include <extern/esm4/alch.hpp>
-#include <extern/esm4/sbsp.hpp>
-#include <extern/esm4/sgst.hpp>
-#include <extern/esm4/lvli.hpp>
-#include <extern/esm4/lvln.hpp>
-#include <extern/esm4/idlm.hpp>
-#include <extern/esm4/mstt.hpp>
-#include <extern/esm4/txst.hpp>
-#include <extern/esm4/scrl.hpp>
-#include <extern/esm4/arma.hpp>
-#include <extern/esm4/hdpt.hpp>
-#include <extern/esm4/term.hpp>
-#include <extern/esm4/tact.hpp>
-#include <extern/esm4/note.hpp>
-#include <extern/esm4/bptd.hpp>
-#include <extern/esm4/scpt.hpp>
-#include <extern/esm4/regn.hpp>
-#include <extern/esm4/land.hpp>
-#include <extern/esm4/anio.hpp>
-#include <extern/esm4/dial.hpp>
-#include <extern/esm4/info.hpp>
-#include <extern/esm4/pgrd.hpp>
-#include <extern/esm4/road.hpp>
-#include <extern/esm4/qust.hpp>
-#include <extern/esm4/pack.hpp>
-#include <extern/esm4/lgtm.hpp>
-#include <extern/esm4/pgre.hpp>
-#include <extern/esm4/aspc.hpp>
-#include <extern/esm4/imod.hpp>
-#include <extern/esm4/pwat.hpp>
-#include <extern/esm4/scol.hpp>
-#include <extern/esm4/musc.hpp>
-#include <extern/esm4/aloc.hpp>
-#include <extern/esm4/mset.hpp>
-#include <extern/esm4/dobj.hpp>
-#include <extern/esm4/clfm.hpp>
-#include <extern/esm4/otft.hpp>
-#include <extern/esm4/flst.hpp>
-#include <extern/esm4/sndr.hpp>
-#include <extern/esm4/glob.hpp>
-
-#endif // ESM4_RECORDS_H