Update genlib header includes

spatialnous · Sep 30, 2024 · a61ce10 · a61ce10
1 parent 2e3d766
commit a61ce10
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 36 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "salalib"]
 	path = salalib
 	url = ../../spatialnous/salalib
-[submodule "genlib"]
-	path = genlib
-	url = ../../spatialnous/genlib
 [submodule "depthmapXcli/dxinterface"]
 	path = depthmapXcli/dxinterface
 	url = ../../spatialnous/dxinterface.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,6 @@ set(MODULES_CLI_TEST FALSE)
 set(MODULES_CORE TRUE)
 set(MODULES_CORE_TEST FALSE)
 
-add_subdirectory(genlib)
 add_subdirectory(genlibTest)
 add_subdirectory(salalib)
 add_subdirectory(modules) # only the core modules are loaded here

diff --git a/cliTest/CMakeLists.txt b/cliTest/CMakeLists.txt
@@ -61,7 +61,7 @@ set(external_SRCS
 
 include_directories(SYSTEM "../ThirdParty/Catch" "../ThirdParty/FakeIt")
 
-set(LINK_LIBS salalib genlib)
+set(LINK_LIBS salalib)
 
 set(modules_cliTest "" CACHE INTERNAL "modules_cliTest" FORCE)
 set(MODULES_GUI FALSE)

diff --git a/depthmapXcli/CMakeLists.txt b/depthmapXcli/CMakeLists.txt
@@ -55,7 +55,7 @@ set(depthmapXcli_SRCS
     mapconvertparser.cpp
     segmentshortestpathparser.cpp)
 
-set(LINK_LIBS salalib genlib)
+set(LINK_LIBS salalib)
 
 set(modules_cli "" CACHE INTERNAL "modules_cli" FORCE)
 set(MODULES_GUI FALSE)

diff --git a/depthmapXcli/agentparser.h b/depthmapXcli/agentparser.h
@@ -7,7 +7,7 @@
 #include "commandlineparser.h"
 #include "imodeparser.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include <string>
 

diff --git a/depthmapXcli/axialparser.h b/depthmapXcli/axialparser.h
@@ -6,7 +6,7 @@
 
 #include "imodeparser.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 class AxialParser : public IModeParser {
   public:

diff --git a/depthmapXcli/dxinterface b/depthmapXcli/dxinterface
diff --git a/depthmapXcli/exceptions.h b/depthmapXcli/exceptions.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "genlib/exceptions.h"
+#include "salalib/genlib/exceptions.h"
 
 #include <string>
 

diff --git a/depthmapXcli/printcommunicator.h b/depthmapXcli/printcommunicator.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "genlib/comm.h"
+#include "salalib/genlib/comm.h"
 
 class PrintCommunicator : public ICommunicator {
   public:

diff --git a/depthmapXcli/segmentshortestpathparser.h b/depthmapXcli/segmentshortestpathparser.h
@@ -6,7 +6,7 @@
 
 #include "imodeparser.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include <vector>
 

diff --git a/depthmapXcli/stepdepthparser.h b/depthmapXcli/stepdepthparser.h
@@ -6,7 +6,7 @@
 
 #include "imodeparser.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include <vector>
 

diff --git a/depthmapXcli/visprepparser.h b/depthmapXcli/visprepparser.h
@@ -6,7 +6,7 @@
 
 #include "imodeparser.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include <vector>
 

diff --git a/genlib b/genlib
diff --git a/genlibTest/CMakeLists.txt b/genlibTest/CMakeLists.txt
@@ -19,7 +19,7 @@ set(external_SRCS
 ) # external_SRCS
 
 set(LINK_LIBS
-    genlib)
+    salalib)
 
 include_directories(SYSTEM "../ThirdParty/Catch")
 

diff --git a/genlibTest/testbspnode.cpp b/genlibTest/testbspnode.cpp
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "genlib/bsptree.h"
-#include "genlib/comm.h"
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/bsptree.h"
+#include "salalib/genlib/comm.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/genlibTest/testcontainerutils.cpp b/genlibTest/testcontainerutils.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "genlib/containerutils.h"
+#include "salalib/genlib/containerutils.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/genlibTest/testreadwritehelpers.cpp b/genlibTest/testreadwritehelpers.cpp
@@ -5,7 +5,7 @@
 
 #include "cliTest/selfcleaningfile.h"
 
-#include "genlib/readwritehelpers.h"
+#include "salalib/genlib/readwritehelpers.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/genlibTest/testsimplematrix.cpp b/genlibTest/testsimplematrix.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "genlib/simplematrix.h"
+#include "salalib/genlib/simplematrix.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/genlibTest/teststringutils.cpp b/genlibTest/teststringutils.cpp
@@ -3,7 +3,7 @@
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "../genlib/stringutils.h"
+#include "salalib/genlib/stringutils.h"
 
 #include "../cliTest/selfcleaningfile.h"
 #include "catch_amalgamated.hpp"

diff --git a/moduleTest/CMakeLists.txt b/moduleTest/CMakeLists.txt
@@ -33,4 +33,4 @@ set_source_files_properties(
 )
 target_compile_options(${moduleTest} PRIVATE ${COMPILE_WARNINGS})
 
-target_link_libraries(${moduleTest} salalib genlib ${modules_coreTest} ${modules_core})
+target_link_libraries(${moduleTest} salalib ${modules_coreTest} ${modules_core})
diff --git a/salaTest/CMakeLists.txt b/salaTest/CMakeLists.txt
@@ -40,7 +40,7 @@ set(external_SRCS
 
 include_directories(SYSTEM "../ThirdParty/Catch" "../ThirdParty/FakeIt")
 
-set(LINK_LIBS salalib genlib)
+set(LINK_LIBS salalib)
 
 add_executable(${salaTest} ${salaTest_SRCS})
 

diff --git a/salaTest/testdxfp.cpp b/salaTest/testdxfp.cpp
@@ -4,8 +4,8 @@
 
 #include "salalib/parsers/dxfp.h"
 
-#include "genlib/comm.h"
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/comm.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/salaTest/testentityparsing.cpp b/salaTest/testentityparsing.cpp
@@ -5,7 +5,7 @@
 
 #include "salalib/entityparsing.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/salaTest/testgeometrygenerators.cpp b/salaTest/testgeometrygenerators.cpp
@@ -5,7 +5,7 @@
 
 #include "salalib/geometrygenerators.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/salaTest/testisovist.cpp b/salaTest/testisovist.cpp
@@ -4,10 +4,9 @@
 
 #include "salalib/isovistutils.h"
 #include "salalib/salashape.h"
-#include "salalib/shapemapgroupdata.h"
 
-#include "genlib/comm.h"
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/comm.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/salaTest/testsalaprogram.cpp b/salaTest/testsalaprogram.cpp
@@ -4,7 +4,7 @@
 
 #include "../salalib/mapconverter.h"
 #include "catch_amalgamated.hpp"
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 #include "salalib/salaprogram.h"
 #include "salalib/shapegraph.h"
 #include "salalib/shapemapgroupdata.h"

diff --git a/salaTest/testshapegraphs.cpp b/salaTest/testshapegraphs.cpp
@@ -6,7 +6,7 @@
 #include "salalib/shapegraph.h"
 #include "salalib/shapemap.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 #include "salalib/shapemapgroupdata.h"

diff --git a/salaTest/testshapemaps.cpp b/salaTest/testshapemaps.cpp
@@ -5,7 +5,7 @@
 #include "salalib/mapconverter.h"
 #include "salalib/shapemap.h"
 
-#include "genlib/p2dpoly.h"
+#include "salalib/genlib/p2dpoly.h"
 
 #include "catch_amalgamated.hpp"
 

diff --git a/salalib b/salalib
+2 −2		metagraphdx.cpp
+1 −1		metagraphdx.h
+1 −1		shapemapgroupdatadx.h
+1 −0		CMakeLists.txt
+176 −0		LICENSES/LGPL-2.1-or-later.txt
+4 −4		agents/agent.h
+1 −1		agents/agentga.cpp
+2 −2		agents/agentprogram.cpp
+1 −1		agents/agentprogram.h
+1 −1		axialmodules/axialintegration.cpp
+2 −2		axialmodules/axialintegration.h
+1 −1		axialmodules/axialstepdepth.cpp
+25 −0		genlib/CMakeLists.txt
+173 −0		genlib/bsptree.cpp
+54 −0		genlib/bsptree.h
+194 −0		genlib/comm.h
+80 −0		genlib/containerutils.h
+26 −0		genlib/exceptions.h
+888 −0		genlib/p2dpoly.cpp
+615 −0		genlib/p2dpoly.h
+82 −0		genlib/pafmath.cpp
+79 −0		genlib/pafmath.h
+38 −0		genlib/pflipper.h
+116 −0		genlib/readwritehelpers.h
+208 −0		genlib/simplematrix.h
+142 −0		genlib/stringutils.cpp
+29 −0		genlib/stringutils.h
+188 −0		genlib/xmlparse.cpp
+31 −0		genlib/xmlparse.h
+2 −2		parsers/dxfp.cpp
+1 −1		parsers/mapinfodata.cpp
+1 −1		parsers/mapinfodata.h
+4 −4		parsers/ntfp.cpp
+2 −2		parsers/ntfp.h
+1 −1		parsers/tigerp.cpp
+2 −2		parsers/tigerp.h
+1 −1		segmmodules/segmtulip.cpp
+1 −1		vgamodules/vgaangular.h
+1 −1		vgamodules/vgaangularopenmp.h
+3 −3		vgamodules/vgaisovist.h
+1 −1		vgamodules/vgametric.h
+2 −2		vgamodules/vgametricopenmp.h
+1 −1		vgamodules/vgavisualglobal.h
+2 −5		vgamodules/vgavisualglobalopenmp.h