Move settings to another target

src/Apps/CoreDxrTriangle/main.cpp

@@ -1,5 +1,5 @@
 #include "AppBox/AppBox.h"
-#include "AppBox/ArgsParser.h"
+#include "AppSettings/ArgsParser.h"
 #include "Instance/Instance.h"
 #include "Utilities/Common.h"
 

src/Apps/CoreTriangle/main.cpp

@@ -1,5 +1,5 @@
 #include "AppBox/AppBox.h"
-#include "AppBox/ArgsParser.h"
+#include "AppSettings/ArgsParser.h"
 #include "Instance/Instance.h"
 
 int main(int argc, char* argv[])

src/Modules/AppBox/AppBox.h

@@ -1,9 +1,9 @@
 #pragma once
 #include "ApiType/ApiType.h"
 #include "AppBox/InputEvents.h"
-#include "AppBox/Settings.h"
 #include "AppBox/WindowEvents.h"
 #include "AppLoop/AppSize.h"
+#include "AppSettings/Settings.h"
 
 #include <GLFW/glfw3.h>
 

src/Modules/AppBox/CMakeLists.txt

@@ -4,22 +4,20 @@ endif()
 
 list(APPEND headers
     AppBox.h
-    ArgsParser.h
     InputEvents.h
-    Settings.h
     WindowEvents.h
 )
 
 list(APPEND sources
     AppBox.cpp
-    ArgsParser.cpp
 )
 
 add_library(AppBox ${headers} ${sources})
 
 target_link_libraries(AppBox
-    glfw
+    AppSettings
     FlyCube
+    glfw
 )
 
 if (APPLE)

src/Modules/AppBox/ArgsParser.cpp → src/Modules/AppSettings/ArgsParser.cpp

@@ -1,8 +1,10 @@
-#include "AppBox/ArgsParser.h"
+#include "AppSettings/ArgsParser.h"
 
 #include <string>
 #include <vector>
 
+namespace {
+
 std::vector<ApiType> GetSupportedApis()
 {
     std::vector<ApiType> res;
@@ -18,6 +20,8 @@ std::vector<ApiType> GetSupportedApis()
     return res;
 }
 
+} // namespace
+
 Settings ParseArgs(int argc, char* argv[])
 {
     Settings settings;

src/Modules/AppBox/ArgsParser.h → src/Modules/AppSettings/ArgsParser.h

@@ -1,6 +1,4 @@
 #pragma once
-#include "AppBox/Settings.h"
-
-#include <cstdint>
+#include "AppSettings/Settings.h"
 
 Settings ParseArgs(int argc, char* argv[]);

src/Modules/AppSettings/CMakeLists.txt

@@ -0,0 +1,23 @@
+if (IOS_OR_TVOS)
+    return()
+endif()
+
+list(APPEND headers
+    ArgsParser.h
+    Settings.h
+)
+
+list(APPEND sources
+    ArgsParser.cpp
+)
+
+add_library(AppSettings ${headers} ${sources})
+
+target_include_directories(AppSettings
+    PUBLIC
+        "${CMAKE_CURRENT_SOURCE_DIR}/.."
+)
+
+target_link_libraries(AppSettings FlyCube)
+
+set_target_properties(AppSettings PROPERTIES FOLDER "Modules")

src/Modules/CMakeLists.txt

@@ -3,4 +3,5 @@ if (NOT IOS_OR_TVOS)
 endif()
 
 add_subdirectory(AppLoop)
+add_subdirectory(AppSettings)
 add_subdirectory(Utilities)