Move files

modules/server/CMakeLists.txt

@@ -1,105 +0,0 @@
-##########################################################################################
-#                                                                                        #
-# OpenSpace                                                                              #
-#                                                                                        #
-# Copyright (c) 2014-2025                                                                #
-#                                                                                        #
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this   #
-# software and associated documentation files (the "Software"), to deal in the Software  #
-# without restriction, including without limitation the rights to use, copy, modify,     #
-# merge, publish, distribute, sublicense, and/or sell copies of the Software, and to     #
-# permit persons to whom the Software is furnished to do so, subject to the following    #
-# conditions:                                                                            #
-#                                                                                        #
-# The above copyright notice and this permission notice shall be included in all copies  #
-# or substantial portions of the Software.                                               #
-#                                                                                        #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,    #
-# INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A          #
-# PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT     #
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF   #
-# CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE   #
-# OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
-##########################################################################################
-
-include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
-set(HEADER_FILES
-  servermodule.h
-  include/connection.h
-  include/connectionpool.h
-  include/jsonconverters.h
-  include/logging/notificationlog.h
-  include/serverinterface.h
-  include/topics/actionkeybindtopic.h
-  include/topics/authorizationtopic.h
-  include/topics/bouncetopic.h
-  include/topics/camerapathtopic.h
-  include/topics/cameratopic.h
-  include/topics/documentationtopic.h
-  include/topics/downloadeventtopic.h
-  include/topics/enginemodetopic.h
-  include/topics/errorlogtopic.h
-  include/topics/eventtopic.h
-  include/topics/flightcontrollertopic.h
-  include/topics/getpropertytopic.h
-  include/topics/luascripttopic.h
-  include/topics/missiontopic.h
-  include/topics/profiletopic.h
-  include/topics/sessionrecordingtopic.h
-  include/topics/setpropertytopic.h
-  include/topics/subscriptiontopic.h
-  include/topics/timetopic.h
-  include/topics/skybrowsertopic.h
-  include/topics/topic.h
-  include/topics/triggerpropertytopic.h
-  include/topics/versiontopic.h
-)
-source_group("Header Files" FILES ${HEADER_FILES})
-
-set(SOURCE_FILES
-  servermodule.cpp
-  src/connection.cpp
-  src/connectionpool.cpp
-  src/jsonconverters.cpp
-  src/logging/notificationlog.cpp
-  src/serverinterface.cpp
-  src/topics/actionkeybindtopic.cpp
-  src/topics/authorizationtopic.cpp
-  src/topics/bouncetopic.cpp
-  src/topics/camerapathtopic.cpp
-  src/topics/cameratopic.cpp
-  src/topics/documentationtopic.cpp
-  src/topics/downloadeventtopic.cpp
-  src/topics/enginemodetopic.cpp
-  src/topics/errorlogtopic.cpp
-  src/topics/eventtopic.cpp
-  src/topics/flightcontrollertopic.cpp
-  src/topics/getpropertytopic.cpp
-  src/topics/luascripttopic.cpp
-  src/topics/missiontopic.cpp
-  src/topics/profiletopic.cpp
-  src/topics/sessionrecordingtopic.cpp
-  src/topics/setpropertytopic.cpp
-  src/topics/subscriptiontopic.cpp
-  src/topics/timetopic.cpp
-  src/topics/skybrowsertopic.cpp
-  src/topics/topic.cpp
-  src/topics/triggerpropertytopic.cpp
-  src/topics/versiontopic.cpp
-)
-source_group("Source Files" FILES ${SOURCE_FILES})
-
-create_new_module(
-  "Server"
-  server_module
-  ${HEADER_FILES} ${SOURCE_FILES}
-)
-
-target_precompile_headers(${server_module} PRIVATE
-  <modules/server/include/connection.h>
-  <modules/server/include/topics/topic.h>
-  <openspace/json.h>
-  <ghoul/misc/templatefactory.h>
-)

modules/server/include.cmake

@@ -1,5 +0,0 @@
-set(DEFAULT_MODULE ON)
-
-set(OPENSPACE_DEPENDENCIES
-  skybrowser
-)

src/CMakeLists.txt

@@ -169,6 +169,35 @@ set(OPENSPACE_SOURCE
   scripting/scriptscheduler_lua.inl
   scripting/systemcapabilitiesbinding.cpp
   scripting/systemcapabilitiesbinding_lua.inl
+  topic/connection.cpp
+  topic/connectionpool.cpp
+  topic/jsonconverters.cpp
+  topic/notificationlog.cpp
+  topic/serverinterface.cpp
+  topic/topicmanager.cpp
+  topic/topics/actionkeybindtopic.cpp
+  topic/topics/authorizationtopic.cpp
+  topic/topics/bouncetopic.cpp
+  topic/topics/camerapathtopic.cpp
+  topic/topics/cameratopic.cpp
+  topic/topics/documentationtopic.cpp
+  topic/topics/downloadeventtopic.cpp
+  topic/topics/enginemodetopic.cpp
+  topic/topics/errorlogtopic.cpp
+  topic/topics/eventtopic.cpp
+  topic/topics/flightcontrollertopic.cpp
+  topic/topics/getpropertytopic.cpp
+  topic/topics/luascripttopic.cpp
+  topic/topics/missiontopic.cpp
+  topic/topics/profiletopic.cpp
+  topic/topics/sessionrecordingtopic.cpp
+  topic/topics/setpropertytopic.cpp
+  topic/topics/subscriptiontopic.cpp
+  topic/topics/timetopic.cpp
+  topic/topics/skybrowsertopic.cpp
+  topic/topics/topic.cpp
+  topic/topics/triggerpropertytopic.cpp
+  topic/topics/versiontopic.cpp
   util/blockplaneintersectiongeometry.cpp
   util/boxgeometry.cpp
   util/collisionhelper.cpp
@@ -363,6 +392,35 @@ set(OPENSPACE_HEADER
   ${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptengine.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptscheduler.h
   ${PROJECT_SOURCE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/connection.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/connectionpool.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/jsonconverters.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/notificationlog.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/serverinterface.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topicmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/actionkeybindtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/authorizationtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/bouncetopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/camerapathtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/cameratopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/documentationtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/downloadeventtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/enginemodetopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/errorlogtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/eventtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/flightcontrollertopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/getpropertytopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/luascripttopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/missiontopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/profiletopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/sessionrecordingtopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/setpropertytopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/subscriptiontopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/timetopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/skybrowsertopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/topic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/triggerpropertytopic.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/topic/topics/versiontopic.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/boxgeometry.h
   ${PROJECT_SOURCE_DIR}/include/openspace/util/collisionhelper.h