From 1ade41f980178530848419d909875f2ff38d587c Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:11:43 +0000 Subject: [PATCH 01/63] Refactor CMake --- .../Core/Utils/ERS_CLASS_ExternalModelLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_ExternalModelLoader/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_ExternalModelLoader/CMakeLists.txt index 2834a3345d..b90be7fd1c 100644 --- a/Source/Core/Utils/ERS_CLASS_ExternalModelLoader/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_ExternalModelLoader/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(ERS_CLASS_ExternalModelLoader set_property(TARGET ERS_CLASS_ExternalModelLoader PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_ExternalModelLoader +target_link_libraries(ERS_CLASS_ExternalModelLoader PRIVATE yaml-cpp glm assimp @@ -26,7 +26,7 @@ target_link_libraries(ERS_CLASS_ExternalModelLoader ) # Link Internal Libs -target_link_libraries(ERS_CLASS_ExternalModelLoader +target_link_libraries(ERS_CLASS_ExternalModelLoader PRIVATE ERS_STRUCT_Mesh ERS_STRUCT_Model ERS_STRUCT_Vertex From e4875e9b84fa08754ba5e913c128dc4036b652c5 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:12:13 +0000 Subject: [PATCH 02/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Camera/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Camera/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Camera/CMakeLists.txt index 9528d51da7..49e4f0c1d9 100644 --- a/Source/Core/Structures/ERS_STRUCT_Camera/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Camera/CMakeLists.txt @@ -16,13 +16,13 @@ add_library(ERS_STRUCT_Camera ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Camera +target_link_libraries(ERS_STRUCT_Camera PRIVATE glm glad ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Camera +target_link_libraries(ERS_STRUCT_Camera PRIVATE ) target_include_directories(ERS_STRUCT_Camera PUBLIC ./) \ No newline at end of file From 7c58f0d302e7c04325eb9fd57f08387a72c7c00b Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:12:38 +0000 Subject: [PATCH 03/63] Refactor CMake --- .../Structures/ERS_STRUCT_ControllerSettings/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ControllerSettings/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ControllerSettings/CMakeLists.txt index 2ef8dbd52c..eb4f531127 100644 --- a/Source/Core/Structures/ERS_STRUCT_ControllerSettings/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ControllerSettings/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_ControllerSettings ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ControllerSettings +target_link_libraries(ERS_STRUCT_ControllerSettings PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ControllerSettings +target_link_libraries(ERS_STRUCT_ControllerSettings PRIVATE ) target_include_directories(ERS_STRUCT_ControllerSettings PUBLIC ./) From 4d02b98663191581c1003e2b3ff67f061c78d632 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:12:47 +0000 Subject: [PATCH 04/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_DepthMap/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_DepthMap/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_DepthMap/CMakeLists.txt index b007a4e824..da0dbcb1db 100644 --- a/Source/Core/Structures/ERS_STRUCT_DepthMap/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_DepthMap/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_DepthMap ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_DepthMap +target_link_libraries(ERS_STRUCT_DepthMap PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_DepthMap +target_link_libraries(ERS_STRUCT_DepthMap PRIVATE ) From 1821a25415c7e60a9929099276025849dfeafaa4 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:02 +0000 Subject: [PATCH 05/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_HardwareInfo/CMakeLists.txt | 4 ++-- .../ERS_STRUCT_HumanInputDeviceUtils/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_HardwareInfo/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_HardwareInfo/CMakeLists.txt index 31cafab438..28c877620c 100644 --- a/Source/Core/Structures/ERS_STRUCT_HardwareInfo/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_HardwareInfo/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_HardwareInfo ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_HardwareInfo +target_link_libraries(ERS_STRUCT_HardwareInfo PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_HardwareInfo +target_link_libraries(ERS_STRUCT_HardwareInfo PRIVATE ) diff --git a/Source/Core/Structures/ERS_STRUCT_HumanInputDeviceUtils/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_HumanInputDeviceUtils/CMakeLists.txt index bc0b872b9a..f24a8231ae 100644 --- a/Source/Core/Structures/ERS_STRUCT_HumanInputDeviceUtils/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_HumanInputDeviceUtils/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_HumanInputDeviceUtils ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_HumanInputDeviceUtils +target_link_libraries(ERS_STRUCT_HumanInputDeviceUtils PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_HumanInputDeviceUtils +target_link_libraries(ERS_STRUCT_HumanInputDeviceUtils PRIVATE ERS_ControllerInputManager ) From 742f603db007575c6265248866859d9df6b80f80 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:11 +0000 Subject: [PATCH 06/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_IOData/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_IOData/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_IOData/CMakeLists.txt index 4199bfed79..1fc53ceb02 100644 --- a/Source/Core/Structures/ERS_STRUCT_IOData/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_IOData/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_IOData ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_IOData +target_link_libraries(ERS_STRUCT_IOData PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_IOData +target_link_libraries(ERS_STRUCT_IOData PRIVATE ) target_include_directories(ERS_STRUCT_IOData PUBLIC ./) \ No newline at end of file From eaa042486e8dfa146bb2f5a7ae522e4a36c465cd Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:22 +0000 Subject: [PATCH 07/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Light/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Light/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Light/CMakeLists.txt index 85c33e104c..1d04758354 100644 --- a/Source/Core/Structures/ERS_STRUCT_Light/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Light/CMakeLists.txt @@ -20,12 +20,12 @@ add_library(ERS_STRUCT_Light ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Light +target_link_libraries(ERS_STRUCT_Light PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Light +target_link_libraries(ERS_STRUCT_Light PRIVATE ERS_STRUCT_DepthMap ) From 75eab39ad946a237d5a878a43e6b7c01c6f369a6 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:32 +0000 Subject: [PATCH 08/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_LocRotScale/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_LocRotScale/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_LocRotScale/CMakeLists.txt index ba2b0bf2a8..ce9b233465 100644 --- a/Source/Core/Structures/ERS_STRUCT_LocRotScale/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_LocRotScale/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_LocRotScale ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_LocRotScale +target_link_libraries(ERS_STRUCT_LocRotScale PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_LocRotScale +target_link_libraries(ERS_STRUCT_LocRotScale PRIVATE ) From db6c7051c829028bdb080aba4585815969be16f6 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:41 +0000 Subject: [PATCH 09/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Mesh/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Mesh/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Mesh/CMakeLists.txt index 15d2c9861f..7a46d628e7 100644 --- a/Source/Core/Structures/ERS_STRUCT_Mesh/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Mesh/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_Mesh ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Mesh +target_link_libraries(ERS_STRUCT_Mesh PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Mesh +target_link_libraries(ERS_STRUCT_Mesh PRIVATE ERS_STRUCT_Shader ERS_STRUCT_Texture ERS_STRUCT_Vertex From 92dc955fe02731a285751f6f3e2f835f7658f556 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:13:54 +0000 Subject: [PATCH 10/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Model/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Model/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Model/CMakeLists.txt index 36a5067502..8ae8a604a4 100644 --- a/Source/Core/Structures/ERS_STRUCT_Model/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Model/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(ERS_STRUCT_Model ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Model +target_link_libraries(ERS_STRUCT_Model PRIVATE yaml-cpp glm glad @@ -25,7 +25,7 @@ target_link_libraries(ERS_STRUCT_Model ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Model +target_link_libraries(ERS_STRUCT_Model PRIVATE ERS_STRUCT_Shader ERS_STRUCT_Mesh ERS_STRUCT_Texture From 2cfa64b3efbaed2b46b641db2a6abc85c87b66dd Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:14:08 +0000 Subject: [PATCH 11/63] Refactor CMake --- .../Structures/ERS_STRUCT_ModelImportOptions/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ModelImportOptions/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ModelImportOptions/CMakeLists.txt index 0859ff07d1..440e172088 100644 --- a/Source/Core/Structures/ERS_STRUCT_ModelImportOptions/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ModelImportOptions/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_ModelImportOptions ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ModelImportOptions +target_link_libraries(ERS_STRUCT_ModelImportOptions PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ModelImportOptions +target_link_libraries(ERS_STRUCT_ModelImportOptions PRIVATE ) From 42b7e0430efad18e1ac5ca8022119d462484bb85 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:14:17 +0000 Subject: [PATCH 12/63] Refactor CMake --- .../Core/Structures/ERS_STRUCT_ModelWriterData/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ModelWriterData/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ModelWriterData/CMakeLists.txt index 40d32d6d58..99da8339a7 100644 --- a/Source/Core/Structures/ERS_STRUCT_ModelWriterData/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ModelWriterData/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_ModelWriterData ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ModelWriterData +target_link_libraries(ERS_STRUCT_ModelWriterData PRIVATE assimp ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ModelWriterData +target_link_libraries(ERS_STRUCT_ModelWriterData PRIVATE ERS_STRUCT_Model ) From 7feba838509886c6b570a14e9db22663af7a427d Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:14:25 +0000 Subject: [PATCH 13/63] Refactor CMake --- .../Core/Structures/ERS_STRUCT_OpenGLDefaults/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_OpenGLDefaults/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_OpenGLDefaults/CMakeLists.txt index 5ead1ea281..f4f4a7260d 100644 --- a/Source/Core/Structures/ERS_STRUCT_OpenGLDefaults/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_OpenGLDefaults/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_OpenGLDefaults ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_OpenGLDefaults +target_link_libraries(ERS_STRUCT_OpenGLDefaults PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_OpenGLDefaults +target_link_libraries(ERS_STRUCT_OpenGLDefaults PRIVATE ) target_include_directories(ERS_STRUCT_OpenGLDefaults PUBLIC ./) From 312749d4c652c704b21733cb48fbddd8665094c2 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:14:35 +0000 Subject: [PATCH 14/63] Refactor CMake --- .../Core/Structures/ERS_STRUCT_OpenGLLogItem/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_OpenGLLogItem/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_OpenGLLogItem/CMakeLists.txt index 73df03273a..4eb56dfc20 100644 --- a/Source/Core/Structures/ERS_STRUCT_OpenGLLogItem/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_OpenGLLogItem/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_OpenGLLogItem ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_OpenGLLogItem +target_link_libraries(ERS_STRUCT_OpenGLLogItem PRIVATE glad ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_OpenGLLogItem +target_link_libraries(ERS_STRUCT_OpenGLLogItem PRIVATE ) From 22a2bdd57b1e596ff237bbad0c42ced24bde8b2a Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:14:51 +0000 Subject: [PATCH 15/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Project/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Project/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Project/CMakeLists.txt index be3168f054..3b55945963 100644 --- a/Source/Core/Structures/ERS_STRUCT_Project/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Project/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_Project ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Project +target_link_libraries(ERS_STRUCT_Project PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Project +target_link_libraries(ERS_STRUCT_Project PRIVATE ERS_STRUCT_ControllerSettings ERS_STRUCT_ShaderProgramAssetIDs ERS_STRUCT_Script From e97f2ecfd94874e7a42bd38cc6820b82f017c9a4 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:00 +0000 Subject: [PATCH 16/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_ProjectUtils/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ProjectUtils/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ProjectUtils/CMakeLists.txt index 9a9b8f66d1..5b81ead74a 100644 --- a/Source/Core/Structures/ERS_STRUCT_ProjectUtils/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ProjectUtils/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_ProjectUtils ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ProjectUtils +target_link_libraries(ERS_STRUCT_ProjectUtils PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ProjectUtils +target_link_libraries(ERS_STRUCT_ProjectUtils PRIVATE ERS_CLASS_LoggingSystem ERS_SceneManager From cbfbf992048c74e695f1789db1211345121c2f52 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:16 +0000 Subject: [PATCH 17/63] Refactor CMake --- .../Structures/ERS_STRUCT_RendererSettings/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_RendererSettings/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_RendererSettings/CMakeLists.txt index 7e66aac14a..c41a709034 100644 --- a/Source/Core/Structures/ERS_STRUCT_RendererSettings/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_RendererSettings/CMakeLists.txt @@ -21,11 +21,11 @@ add_library(ERS_STRUCT_RendererSettings ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_RendererSettings +target_link_libraries(ERS_STRUCT_RendererSettings PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_RendererSettings +target_link_libraries(ERS_STRUCT_RendererSettings PRIVATE ) From d6c0972395f571a5514685c22a9e915981f2cbba Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:26 +0000 Subject: [PATCH 18/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_RGBColor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_RGBColor/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_RGBColor/CMakeLists.txt index ebca6afebb..d340e0525f 100644 --- a/Source/Core/Structures/ERS_STRUCT_RGBColor/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_RGBColor/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_RGBColor ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_RGBColor +target_link_libraries(ERS_STRUCT_RGBColor PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_RGBColor +target_link_libraries(ERS_STRUCT_RGBColor PRIVATE ) From 90259c91d79498fad73016a3493e7ff5af732930 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:41 +0000 Subject: [PATCH 19/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Scene/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Scene/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Scene/CMakeLists.txt index 86606b411c..c3531faa29 100644 --- a/Source/Core/Structures/ERS_STRUCT_Scene/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Scene/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_Scene ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Scene +target_link_libraries(ERS_STRUCT_Scene PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Scene +target_link_libraries(ERS_STRUCT_Scene PRIVATE ERS_STRUCT_Model ERS_STRUCT_Light ERS_STRUCT_SceneObject From 07a207806e78d92cf7b7c278bf58cc0cc706e112 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:52 +0000 Subject: [PATCH 20/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt index e7a866e5d5..06ccc36f59 100644 --- a/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_SceneCamera ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_SceneCamera +target_link_libraries(ERS_STRUCT_SceneCamera PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_SceneCamera +target_link_libraries(ERS_STRUCT_SceneCamera PRIVATE ERS_STRUCT_Camera ERS_CLASS_VisualRenderer ) From 442df3370175691cb33f3d8464e6a9a81872f175 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:15:58 +0000 Subject: [PATCH 21/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_SceneObject/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_SceneObject/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_SceneObject/CMakeLists.txt index 2267336aab..98e0fd9941 100644 --- a/Source/Core/Structures/ERS_STRUCT_SceneObject/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_SceneObject/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_SceneObject ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_SceneObject +target_link_libraries(ERS_STRUCT_SceneObject PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_SceneObject +target_link_libraries(ERS_STRUCT_SceneObject PRIVATE ) From d60cd27485c1e553c7dc3266a6d147e175c596de Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:07 +0000 Subject: [PATCH 22/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Script/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Script/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Script/CMakeLists.txt index cb6d8996cf..5ee1669704 100644 --- a/Source/Core/Structures/ERS_STRUCT_Script/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Script/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_Script ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Script +target_link_libraries(ERS_STRUCT_Script PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Script +target_link_libraries(ERS_STRUCT_Script PRIVATE ) From 2581ba64595b1747e7a0edee307a12240fd8007b Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:17 +0000 Subject: [PATCH 23/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Shader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Shader/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Shader/CMakeLists.txt index 694a5cc160..a2efb8a3d3 100644 --- a/Source/Core/Structures/ERS_STRUCT_Shader/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Shader/CMakeLists.txt @@ -16,14 +16,14 @@ add_library(ERS_STRUCT_Shader ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Shader +target_link_libraries(ERS_STRUCT_Shader PRIVATE glm glad glfw ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Shader +target_link_libraries(ERS_STRUCT_Shader PRIVATE ERS_CLASS_LoggingSystem ) From a286430f3932e7c00c6f117ce7c4a208a28ec796 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:27 +0000 Subject: [PATCH 24/63] Refactor CMake --- .../ERS_STRUCT_ShaderProgramAssetIDs/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs/CMakeLists.txt index 9573cb7766..8830e9b384 100644 --- a/Source/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_ShaderProgramAssetIDs ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ShaderProgramAssetIDs +target_link_libraries(ERS_STRUCT_ShaderProgramAssetIDs PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ShaderProgramAssetIDs +target_link_libraries(ERS_STRUCT_ShaderProgramAssetIDs PRIVATE ) From 69841069da9b31a8416c582496270f52d3f6a7de Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:37 +0000 Subject: [PATCH 25/63] Refactor CMake --- .../Structures/ERS_STRUCT_ShaderUniformData/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_ShaderUniformData/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_ShaderUniformData/CMakeLists.txt index f897ba146e..08d11eb4db 100644 --- a/Source/Core/Structures/ERS_STRUCT_ShaderUniformData/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_ShaderUniformData/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_ShaderUniformData ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_ShaderUniformData +target_link_libraries(ERS_STRUCT_ShaderUniformData PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_ShaderUniformData +target_link_libraries(ERS_STRUCT_ShaderUniformData PRIVATE ) From ea62202b9885403e97dbce86134e9c2074af4459 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:46 +0000 Subject: [PATCH 26/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt index 50ab3d9f71..72f394259c 100644 --- a/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_Viewport ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Viewport +target_link_libraries(ERS_STRUCT_Viewport PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Viewport +target_link_libraries(ERS_STRUCT_Viewport PRIVATE ERS_STRUCT_Camera ERS_CLASS_VisualRenderer From d6f0b022d65e6ef5905a455dd6aa188da8c76ff0 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:16:55 +0000 Subject: [PATCH 27/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Vertex/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Vertex/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Vertex/CMakeLists.txt index 9b17f9414e..7b26ae91f4 100644 --- a/Source/Core/Structures/ERS_STRUCT_Vertex/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Vertex/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_STRUCT_Vertex ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Vertex +target_link_libraries(ERS_STRUCT_Vertex PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Vertex +target_link_libraries(ERS_STRUCT_Vertex PRIVATE ) From b2fbbe521396a502493e9d251d8e37b8bf5068dd Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:17:04 +0000 Subject: [PATCH 28/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_TextureLevel/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_TextureLevel/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_TextureLevel/CMakeLists.txt index 7bb02060c6..852fcb1f1f 100644 --- a/Source/Core/Structures/ERS_STRUCT_TextureLevel/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_TextureLevel/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(ERS_STRUCT_TextureLevel ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_TextureLevel +target_link_libraries(ERS_STRUCT_TextureLevel PRIVATE yaml-cpp glm glad @@ -26,7 +26,7 @@ target_link_libraries(ERS_STRUCT_TextureLevel ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_TextureLevel +target_link_libraries(ERS_STRUCT_TextureLevel PRIVATE ) target_include_directories(ERS_STRUCT_TextureLevel PUBLIC ./) \ No newline at end of file From d1bdfab53261d5270e05046410d46e3b2a4f270e Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:17:13 +0000 Subject: [PATCH 29/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Texture/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Texture/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Texture/CMakeLists.txt index 997be84acb..13ef38c49c 100644 --- a/Source/Core/Structures/ERS_STRUCT_Texture/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Texture/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(ERS_STRUCT_Texture ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_Texture +target_link_libraries(ERS_STRUCT_Texture PRIVATE yaml-cpp glm glad @@ -26,7 +26,7 @@ target_link_libraries(ERS_STRUCT_Texture ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_Texture +target_link_libraries(ERS_STRUCT_Texture PRIVATE ERS_STRUCT_TextureLevel ) From d669d9588227f7b0c73909ee885ff00541f54d43 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:17:21 +0000 Subject: [PATCH 30/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt index deafa91644..43f6ad4475 100644 --- a/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_STRUCT_SystemUtils ) # Link 3rd Party Libs -target_link_libraries(ERS_STRUCT_SystemUtils +target_link_libraries(ERS_STRUCT_SystemUtils PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_STRUCT_SystemUtils +target_link_libraries(ERS_STRUCT_SystemUtils PRIVATE ERS_InputOutputSubsystem ERS_FramerateManager From da29150518308df78a0535590ad6c0a05c36af94 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:18:20 +0000 Subject: [PATCH 31/63] Refactor CMake --- Source/Core/Utils/ERS_CLASS_ArgumentParser/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_ArgumentParser/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_ArgumentParser/CMakeLists.txt index 8b1924254c..9e9dc47f97 100644 --- a/Source/Core/Utils/ERS_CLASS_ArgumentParser/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_ArgumentParser/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_CLASS_ArgumentParser ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_ArgumentParser +target_link_libraries(ERS_CLASS_ArgumentParser PRIVATE ERS_CLASS_LoggingSystem ) # Link Internal Libs -target_link_libraries(ERS_CLASS_ArgumentParser +target_link_libraries(ERS_CLASS_ArgumentParser PRIVATE ) target_include_directories(ERS_CLASS_ArgumentParser PUBLIC ./) \ No newline at end of file From 6fe12430e5bde4f4defb655c09f932e76310f8d0 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:18:28 +0000 Subject: [PATCH 32/63] Refactor CMake --- Source/Core/Utils/ERS_CLASS_GPURequest/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_GPURequest/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_GPURequest/CMakeLists.txt index 2361511c4a..fb5c50f6db 100644 --- a/Source/Core/Utils/ERS_CLASS_GPURequest/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_GPURequest/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_CLASS_GPURequest ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_GPURequest +target_link_libraries(ERS_CLASS_GPURequest PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_CLASS_GPURequest +target_link_libraries(ERS_CLASS_GPURequest PRIVATE ) target_include_directories(ERS_CLASS_GPURequest PUBLIC ./) \ No newline at end of file From 8f320cacc615b71cbd4432a1ca64aef86167f444 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:18:36 +0000 Subject: [PATCH 33/63] Refactor CMake --- .../Core/Utils/ERS_CLASS_HardwareInformation/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_HardwareInformation/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_HardwareInformation/CMakeLists.txt index 8886951609..659aaa5ab7 100644 --- a/Source/Core/Utils/ERS_CLASS_HardwareInformation/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_HardwareInformation/CMakeLists.txt @@ -16,14 +16,14 @@ add_library(ERS_CLASS_HardwareInformation ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_HardwareInformation +target_link_libraries(ERS_CLASS_HardwareInformation PRIVATE infoware ThreadNamingUtils ${CMAKE_THREAD_LIBS_INIT} ) # Link Internal Libs -target_link_libraries(ERS_CLASS_HardwareInformation +target_link_libraries(ERS_CLASS_HardwareInformation PRIVATE ERS_CLASS_LoggingSystem From 6ba66ebf76d950757994b2554b9ec48c876db31a Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:18:45 +0000 Subject: [PATCH 34/63] Refactor CMake --- .../Core/Utils/ERS_CLASS_InputOutputSubsystem/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_InputOutputSubsystem/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_InputOutputSubsystem/CMakeLists.txt index 16b9b91b10..f0c6812850 100644 --- a/Source/Core/Utils/ERS_CLASS_InputOutputSubsystem/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_InputOutputSubsystem/CMakeLists.txt @@ -22,12 +22,12 @@ add_library(ERS_InputOutputSubsystem set_property(TARGET ERS_InputOutputSubsystem PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_InputOutputSubsystem +target_link_libraries(ERS_InputOutputSubsystem PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_InputOutputSubsystem +target_link_libraries(ERS_InputOutputSubsystem PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_IOData ) From 40bd21546c47683ddadfdd3ba40679516fcafb99 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:18:55 +0000 Subject: [PATCH 35/63] Refactor CMake --- Source/Core/Utils/ERS_CLASS_LoggingSystem/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_LoggingSystem/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_LoggingSystem/CMakeLists.txt index 5257dc7e35..75968d5c8f 100644 --- a/Source/Core/Utils/ERS_CLASS_LoggingSystem/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_LoggingSystem/CMakeLists.txt @@ -21,13 +21,13 @@ add_library(ERS_CLASS_LoggingSystem ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_LoggingSystem +target_link_libraries(ERS_CLASS_LoggingSystem PRIVATE yaml-cpp glad ) # Link Internal Libs -target_link_libraries(ERS_CLASS_LoggingSystem +target_link_libraries(ERS_CLASS_LoggingSystem PRIVATE ERS_STRUCT_RGBColor ERS_STRUCT_OpenGLLogItem ) From 5b0a911a4786436c42276a811eda51c3f07fb90e Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:19:04 +0000 Subject: [PATCH 36/63] Refactor CMake --- Source/Core/Utils/ERS_CLASS_ModelImporter/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_ModelImporter/CMakeLists.txt b/Source/Core/Utils/ERS_CLASS_ModelImporter/CMakeLists.txt index 458ad394dc..5042e556f2 100644 --- a/Source/Core/Utils/ERS_CLASS_ModelImporter/CMakeLists.txt +++ b/Source/Core/Utils/ERS_CLASS_ModelImporter/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(ERS_CLASS_ModelImporter ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_ModelImporter +target_link_libraries(ERS_CLASS_ModelImporter PRIVATE yaml-cpp glm assimp @@ -25,7 +25,7 @@ target_link_libraries(ERS_CLASS_ModelImporter ) # Link Internal Libs -target_link_libraries(ERS_CLASS_ModelImporter +target_link_libraries(ERS_CLASS_ModelImporter PRIVATE ERS_STRUCT_Model ERS_STRUCT_ModelWriterData ERS_STRUCT_SystemUtils From 8e10b043e27af709eb5f816e0be75b88344770a1 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:19:20 +0000 Subject: [PATCH 37/63] Refactor CMake --- Source/Core/Writers/ERS_SceneWriter/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Writers/ERS_SceneWriter/CMakeLists.txt b/Source/Core/Writers/ERS_SceneWriter/CMakeLists.txt index 42e0abbbe3..d6487777cc 100644 --- a/Source/Core/Writers/ERS_SceneWriter/CMakeLists.txt +++ b/Source/Core/Writers/ERS_SceneWriter/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_SceneWriter ) # Link 3rd Party Libs -target_link_libraries(ERS_SceneWriter +target_link_libraries(ERS_SceneWriter PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_SceneWriter +target_link_libraries(ERS_SceneWriter PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_Model ERS_STRUCT_Scene From 30e79f6171c5354eeb3f3ff7522c2315ce9a1737 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:19:34 +0000 Subject: [PATCH 38/63] Refactor CMake --- Source/Core/Writers/ERS_ModelWriter/CMakeLists.txt | 4 ++-- Source/Core/Writers/ERS_ProjectWriter/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Writers/ERS_ModelWriter/CMakeLists.txt b/Source/Core/Writers/ERS_ModelWriter/CMakeLists.txt index e9e98c26a8..4e0e37f7b2 100644 --- a/Source/Core/Writers/ERS_ModelWriter/CMakeLists.txt +++ b/Source/Core/Writers/ERS_ModelWriter/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_ModelWriter ) # Link 3rd Party Libs -target_link_libraries(ERS_ModelWriter +target_link_libraries(ERS_ModelWriter PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_ModelWriter +target_link_libraries(ERS_ModelWriter PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_Model ERS_STRUCT_Scene diff --git a/Source/Core/Writers/ERS_ProjectWriter/CMakeLists.txt b/Source/Core/Writers/ERS_ProjectWriter/CMakeLists.txt index 17bb75d869..5d019b1a1e 100644 --- a/Source/Core/Writers/ERS_ProjectWriter/CMakeLists.txt +++ b/Source/Core/Writers/ERS_ProjectWriter/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_ProjectWriter ) # Link 3rd Party Libs -target_link_libraries(ERS_ProjectWriter +target_link_libraries(ERS_ProjectWriter PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_ProjectWriter +target_link_libraries(ERS_ProjectWriter PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_Project ERS_STRUCT_IOData From 51d2ce16c5004dbfd5ee83e9f0712da82d06ce89 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:19:57 +0000 Subject: [PATCH 39/63] Refactor CMake --- .../ERS_CLASS_PythonInterpreterIntegration/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Script/ERS_CLASS_PythonInterpreterIntegration/CMakeLists.txt b/Source/Core/Script/ERS_CLASS_PythonInterpreterIntegration/CMakeLists.txt index 320cafb52d..5ce88d37ec 100644 --- a/Source/Core/Script/ERS_CLASS_PythonInterpreterIntegration/CMakeLists.txt +++ b/Source/Core/Script/ERS_CLASS_PythonInterpreterIntegration/CMakeLists.txt @@ -27,12 +27,12 @@ add_library(ERS_CLASS_PythonInterpreterIntegration ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_PythonInterpreterIntegration +target_link_libraries(ERS_CLASS_PythonInterpreterIntegration PRIVATE pybind11::embed ) # Link Internal Libs -target_link_libraries(ERS_CLASS_PythonInterpreterIntegration +target_link_libraries(ERS_CLASS_PythonInterpreterIntegration PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_Model From 4fa97cdf6945fa3fef6e00f67edcf586f5a6783e Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:20:11 +0000 Subject: [PATCH 40/63] Refactor CMake --- Source/Core/Renderer/ERS_CLASS_VisualRenderer/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Renderer/ERS_CLASS_VisualRenderer/CMakeLists.txt b/Source/Core/Renderer/ERS_CLASS_VisualRenderer/CMakeLists.txt index a5f87bb059..512b3dd6b0 100644 --- a/Source/Core/Renderer/ERS_CLASS_VisualRenderer/CMakeLists.txt +++ b/Source/Core/Renderer/ERS_CLASS_VisualRenderer/CMakeLists.txt @@ -57,7 +57,7 @@ add_library(ERS_CLASS_VisualRenderer ) # Link 3rd Party Libs -target_link_libraries(ERS_CLASS_VisualRenderer +target_link_libraries(ERS_CLASS_VisualRenderer PRIVATE yaml-cpp glm glad @@ -66,7 +66,7 @@ target_link_libraries(ERS_CLASS_VisualRenderer ) # Link Internal Libs -target_link_libraries(ERS_CLASS_VisualRenderer +target_link_libraries(ERS_CLASS_VisualRenderer PRIVATE ERS_STRUCT_Camera ERS_STRUCT_SceneCamera From 1350e7e40eaa537535662e2dec0f4f7fe534565a Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:20:20 +0000 Subject: [PATCH 41/63] Refactor CMake --- Source/Core/Renderer/ERS_CLASS_RendererManager/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Renderer/ERS_CLASS_RendererManager/CMakeLists.txt b/Source/Core/Renderer/ERS_CLASS_RendererManager/CMakeLists.txt index 5601fb193a..7bd93810ff 100644 --- a/Source/Core/Renderer/ERS_CLASS_RendererManager/CMakeLists.txt +++ b/Source/Core/Renderer/ERS_CLASS_RendererManager/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(Renderer ) # Link 3rd Party Libs -target_link_libraries(Renderer +target_link_libraries(Renderer PRIVATE yaml-cpp glm glad @@ -25,7 +25,7 @@ target_link_libraries(Renderer ) # Link Internal Libs -target_link_libraries(Renderer +target_link_libraries(Renderer PRIVATE ERS_CLASS_LoggingSystem ERS_CLASS_VisualRenderer From 278c7660481bc69b2ba5a4d876ea6ec824bf87cf Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:20:34 +0000 Subject: [PATCH 42/63] Refactor CMake --- Source/Core/Manager/ERS_SceneManager/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt b/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt index 3a58403465..a31743136a 100644 --- a/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_SceneManager/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_SceneManager ) # Link 3rd Party Libs -target_link_libraries(ERS_SceneManager +target_link_libraries(ERS_SceneManager PRIVATE glm ) # Link Internal Libs -target_link_libraries(ERS_SceneManager +target_link_libraries(ERS_SceneManager PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_Shader From 09bb51a3c46163e8c45be16c94f4eec94f3dfa94 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:20:45 +0000 Subject: [PATCH 43/63] Refactor CMake --- Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt b/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt index 86eadbf2a8..bb871945fc 100644 --- a/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_ProjectManager/CMakeLists.txt @@ -18,11 +18,11 @@ add_library(ERS_ProjectManager set_property(TARGET ERS_ProjectManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_ProjectManager +target_link_libraries(ERS_ProjectManager PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_ProjectManager +target_link_libraries(ERS_ProjectManager PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_Project From 275994fb158047fb2ebbcdb4269fe78a531d1d30 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:20:52 +0000 Subject: [PATCH 44/63] Refactor CMake --- Source/Core/Manager/ERS_FramerateManager/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Manager/ERS_FramerateManager/CMakeLists.txt b/Source/Core/Manager/ERS_FramerateManager/CMakeLists.txt index 150172f688..8149ef408e 100644 --- a/Source/Core/Manager/ERS_FramerateManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_FramerateManager/CMakeLists.txt @@ -18,13 +18,13 @@ add_library(ERS_FramerateManager set_property(TARGET ERS_FramerateManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_FramerateManager +target_link_libraries(ERS_FramerateManager PRIVATE glad glfw ) # Link Internal Libs -target_link_libraries(ERS_FramerateManager +target_link_libraries(ERS_FramerateManager PRIVATE ) target_include_directories(ERS_FramerateManager PUBLIC ./) From 3321a98d55b6fb3425df0434c2235934b1d0f9d7 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:02 +0000 Subject: [PATCH 45/63] Refactor CMake --- Source/Core/Manager/ERS_ControllerManager/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Manager/ERS_ControllerManager/CMakeLists.txt b/Source/Core/Manager/ERS_ControllerManager/CMakeLists.txt index 9c82327eab..2b332a498f 100644 --- a/Source/Core/Manager/ERS_ControllerManager/CMakeLists.txt +++ b/Source/Core/Manager/ERS_ControllerManager/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(ERS_ControllerInputManager #set_property(TARGET ERS_ControllerInputManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_ControllerInputManager +target_link_libraries(ERS_ControllerInputManager PRIVATE glad glfw @@ -26,7 +26,7 @@ target_link_libraries(ERS_ControllerInputManager ) # Link Internal Libs -target_link_libraries(ERS_ControllerInputManager +target_link_libraries(ERS_ControllerInputManager PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ControllerSettings From e17b68e4db684bb404184fca525f364549a4c139 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:17 +0000 Subject: [PATCH 46/63] Refactor CMake --- Source/Core/Loader/ERS_ShaderLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ShaderLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ShaderLoader/CMakeLists.txt index 482948bc9a..9ef258c9a1 100644 --- a/Source/Core/Loader/ERS_ShaderLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ShaderLoader/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_ShaderLoader ) # Link 3rd Party Libs -target_link_libraries(ERS_ShaderLoader +target_link_libraries(ERS_ShaderLoader PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_ShaderLoader +target_link_libraries(ERS_ShaderLoader PRIVATE ERS_STRUCT_Shader ERS_STRUCT_IOData ERS_STRUCT_SystemUtils From 37c13bc3faa3393aee371febd7aeb86e47d8556b Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:25 +0000 Subject: [PATCH 47/63] Refactor CMake --- Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt b/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt index ddf4c6a999..6c9dfd5669 100644 --- a/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_SceneLoader/CMakeLists.txt @@ -28,12 +28,12 @@ add_library(ERS_SceneLoader ) # Link 3rd Party Libs -target_link_libraries(ERS_SceneLoader +target_link_libraries(ERS_SceneLoader PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_SceneLoader +target_link_libraries(ERS_SceneLoader PRIVATE ERS_ModelLoader From 2e7e4426cb351fbf5dd761c232beb9edaa6a9558 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:34 +0000 Subject: [PATCH 48/63] Refactor CMake --- Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt index 540720dc4a..a087aa86c4 100644 --- a/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ProjectLoader/CMakeLists.txt @@ -16,11 +16,11 @@ add_library(ERS_ProjectLoader ) # Link 3rd Party Libs -target_link_libraries(ERS_ProjectLoader +target_link_libraries(ERS_ProjectLoader PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_ProjectLoader +target_link_libraries(ERS_ProjectLoader PRIVATE ERS_STRUCT_IOData ERS_STRUCT_SystemUtils ERS_STRUCT_Project From 2b629d9153ebc8569a37d5bf46a807fa0fbabc6c Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:45 +0000 Subject: [PATCH 49/63] Refactor CMake --- Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt index bd90c97ca3..ef0f49b529 100644 --- a/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ModelLoader/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(ERS_ModelLoader ) # Link 3rd Party Libs -target_link_libraries(ERS_ModelLoader +target_link_libraries(ERS_ModelLoader PRIVATE yaml-cpp glm assimp @@ -38,7 +38,7 @@ target_link_libraries(ERS_ModelLoader ) # Link Internal Libs -target_link_libraries(ERS_ModelLoader +target_link_libraries(ERS_ModelLoader PRIVATE ERS_STRUCT_Mesh ERS_STRUCT_Model ERS_STRUCT_Texture From 2c1789ad47e1c5c5d5cf13d7fdfc9f564c3a9eb7 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:21:52 +0000 Subject: [PATCH 50/63] Refactor CMake --- .../Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt b/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt index 157e8ca5a2..514d7ecaab 100644 --- a/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt +++ b/Source/Core/Loader/ERS_ControllerSettingsLoader/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(ERS_ControllerSettingsLoader ) # Link 3rd Party Libs -target_link_libraries(ERS_ControllerSettingsLoader +target_link_libraries(ERS_ControllerSettingsLoader PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_ControllerSettingsLoader +target_link_libraries(ERS_ControllerSettingsLoader PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_IOData ERS_STRUCT_ControllerSettings From d54f674c223b9c114498864877b45ec700a1a16f Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:22:20 +0000 Subject: [PATCH 51/63] Refactor CMake --- Source/Core/Editor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Editor/CMakeLists.txt b/Source/Core/Editor/CMakeLists.txt index eb87579ca2..3c030cb509 100644 --- a/Source/Core/Editor/CMakeLists.txt +++ b/Source/Core/Editor/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(VisualEditor ) # Link 3rd Party Libs -target_link_libraries(VisualEditor +target_link_libraries(VisualEditor PRIVATE glad glfw IMGUI @@ -25,7 +25,7 @@ target_link_libraries(VisualEditor ) # Link Internal Libs -target_link_libraries(VisualEditor +target_link_libraries(VisualEditor PRIVATE ERS_CLASS_LoggingSystem ERS_CLASS_VisualRenderer From f486e966d741687d709842cb3338f62b38972482 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:22:45 +0000 Subject: [PATCH 52/63] Refactor CMake --- .../Editor/Windows/GUI_Window_ThemeSelector/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_ThemeSelector/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ThemeSelector/CMakeLists.txt index db03871a57..d88c813f9d 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ThemeSelector/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ThemeSelector/CMakeLists.txt @@ -18,12 +18,12 @@ add_library(GUI_Window_ThemeSelector ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ThemeSelector +target_link_libraries(GUI_Window_ThemeSelector PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_ThemeSelector +target_link_libraries(GUI_Window_ThemeSelector PRIVATE ERS_Editor_ThemeManager ) From b85a11007aa71a8d02d01141c73775ab7a8fda58 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:22:53 +0000 Subject: [PATCH 53/63] Refactor CMake --- .../Core/Editor/Windows/GUI_Window_TestEditor/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_TestEditor/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_TestEditor/CMakeLists.txt index 587cbdc04e..12aa3e756b 100644 --- a/Source/Core/Editor/Windows/GUI_Window_TestEditor/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_TestEditor/CMakeLists.txt @@ -16,13 +16,13 @@ add_library(GUI_Window_TestEditor ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_TestEditor +target_link_libraries(GUI_Window_TestEditor PRIVATE IMGUI ImGuiColorTextEdit ) # Link Internal Libs -target_link_libraries(GUI_Window_TestEditor +target_link_libraries(GUI_Window_TestEditor PRIVATE ERS_STRUCT_SystemUtils ) From 1be572fdc8e961dc0f01ec2d0cee4921c0ce3b1f Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:23:16 +0000 Subject: [PATCH 54/63] Refactor CMake --- .../Core/Editor/Windows/GUI_Window_SceneTree/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_ScriptEditor/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_ShaderEditor/CMakeLists.txt | 4 ++-- .../Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_SceneTree/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_SceneTree/CMakeLists.txt index f0877ff4af..1adc56036d 100644 --- a/Source/Core/Editor/Windows/GUI_Window_SceneTree/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_SceneTree/CMakeLists.txt @@ -48,14 +48,14 @@ add_library(GUI_Window_SceneTree ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_SceneTree +target_link_libraries(GUI_Window_SceneTree PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_SceneTree +target_link_libraries(GUI_Window_SceneTree PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ERS_STRUCT_SceneObject diff --git a/Source/Core/Editor/Windows/GUI_Window_ScriptEditor/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ScriptEditor/CMakeLists.txt index 20486a38d6..8631c955c3 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ScriptEditor/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ScriptEditor/CMakeLists.txt @@ -16,13 +16,13 @@ add_library(GUI_Window_ScriptEditor ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ScriptEditor +target_link_libraries(GUI_Window_ScriptEditor PRIVATE IMGUI ImGuiColorTextEdit ) # Link Internal Libs -target_link_libraries(GUI_Window_ScriptEditor +target_link_libraries(GUI_Window_ScriptEditor PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ERS_STRUCT_Script diff --git a/Source/Core/Editor/Windows/GUI_Window_ShaderEditor/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ShaderEditor/CMakeLists.txt index d9f6e06a2c..6e3e2a3703 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ShaderEditor/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ShaderEditor/CMakeLists.txt @@ -16,13 +16,13 @@ add_library(GUI_Window_ShaderEditor ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ShaderEditor +target_link_libraries(GUI_Window_ShaderEditor PRIVATE IMGUI ImGuiColorTextEdit ) # Link Internal Libs -target_link_libraries(GUI_Window_ShaderEditor +target_link_libraries(GUI_Window_ShaderEditor PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ERS_STRUCT_Shader diff --git a/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt index 39dc4558d4..013d689fa2 100644 --- a/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_SystemLog/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(GUI_Window_SystemLog ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_SystemLog +target_link_libraries(GUI_Window_SystemLog PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_SystemLog +target_link_libraries(GUI_Window_SystemLog PRIVATE ERS_STRUCT_SystemUtils ) From 55e50faf144b2194523717df1c00f2f437ef21d5 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:23:27 +0000 Subject: [PATCH 55/63] Refactor CMake --- Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_RenderingSettings/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt index 11ea069856..e7d7aa98c7 100644 --- a/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_RAMGraph/CMakeLists.txt @@ -8,13 +8,13 @@ add_library(GUI_Window_RAMGraph ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_RAMGraph +target_link_libraries(GUI_Window_RAMGraph PRIVATE IMGUI ImPlot ) # Link Internal Libs -target_link_libraries(GUI_Window_RAMGraph +target_link_libraries(GUI_Window_RAMGraph PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_HardwareInfo diff --git a/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt index 67e8544f30..737deaefd0 100644 --- a/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_RenderingSettings/CMakeLists.txt @@ -8,14 +8,14 @@ add_library(GUI_Window_RenderingSettings ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_RenderingSettings +target_link_libraries(GUI_Window_RenderingSettings PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_RenderingSettings +target_link_libraries(GUI_Window_RenderingSettings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_RendererSettings From 197b5d7351450745b1ff0f275ae4a446e2f4b115 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:23:40 +0000 Subject: [PATCH 56/63] Refactor CMake --- .../Core/Editor/Windows/GUI_Window_OpenProject/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_ProjectSettings/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_OpenProject/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_OpenProject/CMakeLists.txt index 60ab691ea7..3210acb8e0 100644 --- a/Source/Core/Editor/Windows/GUI_Window_OpenProject/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_OpenProject/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(GUI_Window_OpenProject ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_OpenProject +target_link_libraries(GUI_Window_OpenProject PRIVATE glad glfw IMGUI @@ -24,7 +24,7 @@ target_link_libraries(GUI_Window_OpenProject ) # Link Internal Libs -target_link_libraries(GUI_Window_OpenProject +target_link_libraries(GUI_Window_OpenProject PRIVATE ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_ProjectSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ProjectSettings/CMakeLists.txt index 91228a8b5d..b158349fb7 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ProjectSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ProjectSettings/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(GUI_Window_ProjectSettings ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ProjectSettings +target_link_libraries(GUI_Window_ProjectSettings PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_ProjectSettings +target_link_libraries(GUI_Window_ProjectSettings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils From 3fa974fea7f3d0c107b6fffa6a6d329a22d929fa Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:24:08 +0000 Subject: [PATCH 57/63] Refactor CMake --- .../Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_ImportProgressBar/CMakeLists.txt | 4 ++-- .../Core/Editor/Windows/GUI_Window_NewProject/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt index 71f6bf6f39..a84dfb1ae9 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt @@ -18,13 +18,13 @@ add_library(GUI_Window_ImportModelDirectory set_property(TARGET GUI_Window_ImportModelDirectory PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ImportModelDirectory +target_link_libraries(GUI_Window_ImportModelDirectory PRIVATE IMGUI ImGuiFileDialog ) # Link Internal Libs -target_link_libraries(GUI_Window_ImportModelDirectory +target_link_libraries(GUI_Window_ImportModelDirectory PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_SystemUtils diff --git a/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt index 1fb9f1e733..006bf84aa1 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ImportProgressBar/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(GUI_Window_ImportProgressBar ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ImportProgressBar +target_link_libraries(GUI_Window_ImportProgressBar PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_ImportProgressBar +target_link_libraries(GUI_Window_ImportProgressBar PRIVATE ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_NewProject/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_NewProject/CMakeLists.txt index d946248b42..60d6fa8de5 100644 --- a/Source/Core/Editor/Windows/GUI_Window_NewProject/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_NewProject/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(GUI_Window_NewProject set_property(TARGET GUI_Window_NewProject PROPERTY CXX_STANDARD 17) # Adds Support For Filesystem Header By Setting To C++ 17 # Link 3rd Party Libs -target_link_libraries(GUI_Window_NewProject +target_link_libraries(GUI_Window_NewProject PRIVATE glad glfw IMGUI @@ -26,7 +26,7 @@ target_link_libraries(GUI_Window_NewProject ) # Link Internal Libs -target_link_libraries(GUI_Window_NewProject +target_link_libraries(GUI_Window_NewProject PRIVATE ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt index 7f6eeba624..3cdd8d6d6a 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ObjectProperties/CMakeLists.txt @@ -8,14 +8,14 @@ add_library(GUI_Window_ObjectProperties ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ObjectProperties +target_link_libraries(GUI_Window_ObjectProperties PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_ObjectProperties +target_link_libraries(GUI_Window_ObjectProperties PRIVATE ERS_Editor_3DCursor From 320eea63b4100244c3ab7c4091a268f97c3143a7 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:26:00 +0000 Subject: [PATCH 58/63] Refactor CMake --- Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_ControllerSettings/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt | 4 ++-- .../Windows/GUI_Window_FramerateHistogram/CMakeLists.txt | 4 ++-- .../Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt | 4 ++-- .../Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt index 468b935f34..91075aef82 100644 --- a/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt @@ -16,14 +16,14 @@ add_library(GUI_Window_About ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_About +target_link_libraries(GUI_Window_About PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_About +target_link_libraries(GUI_Window_About PRIVATE ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt index 3974bee334..5755096740 100644 --- a/Source/Core/Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt @@ -18,14 +18,14 @@ add_library(GUI_Window_AssetExplorer ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_AssetExplorer +target_link_libraries(GUI_Window_AssetExplorer PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_AssetExplorer +target_link_libraries(GUI_Window_AssetExplorer PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt index 20194c18c6..1ac5bf5ce0 100644 --- a/Source/Core/Editor/Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt @@ -8,14 +8,14 @@ add_library(GUI_Window_AssetStreamingSettings ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_AssetStreamingSettings +target_link_libraries(GUI_Window_AssetStreamingSettings PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_AssetStreamingSettings +target_link_libraries(GUI_Window_AssetStreamingSettings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ERS_ModelLoader diff --git a/Source/Core/Editor/Windows/GUI_Window_ControllerSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ControllerSettings/CMakeLists.txt index d578ebbe13..6d044a63cb 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ControllerSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ControllerSettings/CMakeLists.txt @@ -16,14 +16,14 @@ add_library(GUI_Window_ControllerSettings ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ControllerSettings +target_link_libraries(GUI_Window_ControllerSettings PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_ControllerSettings +target_link_libraries(GUI_Window_ControllerSettings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils ERS_STRUCT_HumanInputDeviceUtils diff --git a/Source/Core/Editor/Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt index 0c92d4d7d0..3db61367f4 100644 --- a/Source/Core/Editor/Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt @@ -8,14 +8,14 @@ add_library(GUI_Window_EditorCameraSettings ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_EditorCameraSettings +target_link_libraries(GUI_Window_EditorCameraSettings PRIVATE glad glfw IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_EditorCameraSettings +target_link_libraries(GUI_Window_EditorCameraSettings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_RendererSettings diff --git a/Source/Core/Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt index 9a43316bbd..3ef6289fd0 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt @@ -18,12 +18,12 @@ add_library(GUI_Window_FontSelector ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FontSelector +target_link_libraries(GUI_Window_FontSelector PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_FontSelector +target_link_libraries(GUI_Window_FontSelector PRIVATE ERS_Editor_FontManager ) diff --git a/Source/Core/Editor/Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt index 05dbea2215..cabf1d3da2 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt @@ -8,13 +8,13 @@ add_library(GUI_Window_FrameLatencyGraph ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FrameLatencyGraph +target_link_libraries(GUI_Window_FrameLatencyGraph PRIVATE IMGUI ImPlot ) # Link Internal Libs -target_link_libraries(GUI_Window_FrameLatencyGraph +target_link_libraries(GUI_Window_FrameLatencyGraph PRIVATE ERS_STRUCT_SystemUtils ) diff --git a/Source/Core/Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt index d761f4d209..d749e1df13 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt @@ -8,12 +8,12 @@ add_library(GUI_Window_FramerateCounter ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FramerateCounter +target_link_libraries(GUI_Window_FramerateCounter PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_FramerateCounter +target_link_libraries(GUI_Window_FramerateCounter PRIVATE ) target_include_directories(GUI_Window_FramerateCounter PUBLIC ./) \ No newline at end of file diff --git a/Source/Core/Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt index 4c18c242b3..43e4773d7b 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt @@ -8,13 +8,13 @@ add_library(GUI_Window_FramerateGraph ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FramerateGraph +target_link_libraries(GUI_Window_FramerateGraph PRIVATE IMGUI ImPlot ) # Link Internal Libs -target_link_libraries(GUI_Window_FramerateGraph +target_link_libraries(GUI_Window_FramerateGraph PRIVATE ) target_include_directories(GUI_Window_FramerateGraph PUBLIC ./) \ No newline at end of file diff --git a/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt index a653927797..1a542340a7 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt @@ -8,12 +8,12 @@ add_library(GUI_Window_FramerateHistogram ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FramerateHistogram +target_link_libraries(GUI_Window_FramerateHistogram PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_FramerateHistogram +target_link_libraries(GUI_Window_FramerateHistogram PRIVATE ) target_include_directories(GUI_Window_FramerateHistogram PUBLIC ./) \ No newline at end of file diff --git a/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt index 0429b37276..6ac1e73572 100644 --- a/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt @@ -8,12 +8,12 @@ add_library(GUI_Window_FrameratePlot ) # Link 3rd Party Libs -target_link_libraries(GUI_Window_FrameratePlot +target_link_libraries(GUI_Window_FrameratePlot PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(GUI_Window_FrameratePlot +target_link_libraries(GUI_Window_FrameratePlot PRIVATE ) target_include_directories(GUI_Window_FrameratePlot PUBLIC ./) \ No newline at end of file diff --git a/Source/Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt b/Source/Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt index 7c5bb650c1..7835511c41 100644 --- a/Source/Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt +++ b/Source/Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt @@ -18,13 +18,13 @@ add_library(GUI_Window_ImportModel set_property(TARGET GUI_Window_ImportModel PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(GUI_Window_ImportModel +target_link_libraries(GUI_Window_ImportModel PRIVATE IMGUI ImGuiFileDialog ) # Link Internal Libs -target_link_libraries(GUI_Window_ImportModel +target_link_libraries(GUI_Window_ImportModel PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_SystemUtils From 705c0df631a6f284f1afcb1111e0841cbaab7e10 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:28:17 +0000 Subject: [PATCH 59/63] Refactor CMake --- Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt | 4 ++-- Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt | 4 ++-- Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt | 4 ++-- Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt | 4 ++-- Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt | 4 ++-- .../Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt | 4 ++-- .../Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt | 4 ++-- .../Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt | 4 ++-- .../Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt | 4 ++-- .../Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt index 3ae7f55292..5235605eb3 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt @@ -19,13 +19,13 @@ add_library(Menu_Debug ) # Link 3rd Party Libs -target_link_libraries(Menu_Debug +target_link_libraries(Menu_Debug PRIVATE glad IMGUI ) # Link Internal Libs -target_link_libraries(Menu_Debug +target_link_libraries(Menu_Debug PRIVATE GUI_Window_TestEditor GUI_Window_ControllerSettings diff --git a/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt index 6badd68503..c13e30abc7 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt @@ -16,13 +16,13 @@ add_library(Menu_File ) # Link 3rd Party Libs -target_link_libraries(Menu_File +target_link_libraries(Menu_File PRIVATE IMGUI yaml-cpp ) # Link Internal Libs -target_link_libraries(Menu_File +target_link_libraries(Menu_File PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_SystemUtils ERS_STRUCT_ProjectUtils diff --git a/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt index e2d86af064..4d18e29766 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt @@ -16,12 +16,12 @@ add_library(Menu_Settings ) # Link 3rd Party Libs -target_link_libraries(Menu_Settings +target_link_libraries(Menu_Settings PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(Menu_Settings +target_link_libraries(Menu_Settings PRIVATE ERS_STRUCT_SystemUtils ERS_STRUCT_HumanInputDeviceUtils ERS_STRUCT_ProjectUtils diff --git a/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt b/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt index a4c5f93533..cb8ec1057b 100644 --- a/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt +++ b/Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt @@ -17,12 +17,12 @@ add_library(Menu_Window ) # Link 3rd Party Libs -target_link_libraries(Menu_Window +target_link_libraries(Menu_Window PRIVATE IMGUI ) # Link Internal Libs -target_link_libraries(Menu_Window +target_link_libraries(Menu_Window PRIVATE ERS_CLASS_VisualRenderer ERS_STRUCT_SystemUtils diff --git a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt index 1011c25520..72bba1ae27 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt @@ -16,14 +16,14 @@ add_library(ERS_Editor_3DCursor ) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_3DCursor +target_link_libraries(ERS_Editor_3DCursor PRIVATE glm IMGUI ImGuizmo ) # Link Internal Libs -target_link_libraries(ERS_Editor_3DCursor +target_link_libraries(ERS_Editor_3DCursor PRIVATE ERS_CLASS_LoggingSystem ERS_STRUCT_Camera diff --git a/Source/Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt index f5afbed3b3..41e2c46e48 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt @@ -17,13 +17,13 @@ add_library(ERS_Editor_FontManager set_property(TARGET ERS_Editor_FontManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_FontManager +target_link_libraries(ERS_Editor_FontManager PRIVATE yaml-cpp IMGUI ) # Link Internal Libs -target_link_libraries(ERS_Editor_FontManager +target_link_libraries(ERS_Editor_FontManager PRIVATE ERS_CLASS_LoggingSystem ) diff --git a/Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt index 575012f86f..160ef645a9 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt @@ -17,13 +17,13 @@ add_library(ERS_Editor_LayoutManager set_property(TARGET ERS_Editor_LayoutManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_LayoutManager +target_link_libraries(ERS_Editor_LayoutManager PRIVATE yaml-cpp IMGUI ) # Link Internal Libs -target_link_libraries(ERS_Editor_LayoutManager +target_link_libraries(ERS_Editor_LayoutManager PRIVATE ERS_CLASS_LoggingSystem ) diff --git a/Source/Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt index 845fc6ccbf..556376daf9 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt @@ -17,13 +17,13 @@ add_library(ERS_Editor_ThemeManager set_property(TARGET ERS_Editor_ThemeManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_ThemeManager +target_link_libraries(ERS_Editor_ThemeManager PRIVATE yaml-cpp IMGUI ) # Link Internal Libs -target_link_libraries(ERS_Editor_ThemeManager +target_link_libraries(ERS_Editor_ThemeManager PRIVATE ERS_CLASS_LoggingSystem ) diff --git a/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt index 88c3905798..0b131e74dd 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt @@ -17,12 +17,12 @@ add_library(ERS_Editor_UserProfileManager set_property(TARGET ERS_Editor_UserProfileManager PROPERTY CXX_STANDARD 17) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_UserProfileManager +target_link_libraries(ERS_Editor_UserProfileManager PRIVATE yaml-cpp ) # Link Internal Libs -target_link_libraries(ERS_Editor_UserProfileManager +target_link_libraries(ERS_Editor_UserProfileManager PRIVATE ERS_CLASS_LoggingSystem ) diff --git a/Source/Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt b/Source/Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt index 4433244944..90286d4b9d 100644 --- a/Source/Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt +++ b/Source/Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt @@ -18,11 +18,11 @@ add_library(ERS_Editor_WindowManager ) # Link 3rd Party Libs -target_link_libraries(ERS_Editor_WindowManager +target_link_libraries(ERS_Editor_WindowManager PRIVATE ) # Link Internal Libs -target_link_libraries(ERS_Editor_WindowManager +target_link_libraries(ERS_Editor_WindowManager PRIVATE ERS_STRUCT_SystemUtils From b0239eec0759621a1f67ebf2b369262e3f3eafca Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:31:21 +0000 Subject: [PATCH 60/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt | 1 - .../Structures/ERS_STRUCT_SystemUtils/ERS_STRUCT_SystemUtils.h | 2 -- .../Utils/ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.h | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt index 43f6ad4475..0a74495554 100644 --- a/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_SystemUtils/CMakeLists.txt @@ -24,7 +24,6 @@ target_link_libraries(ERS_STRUCT_SystemUtils PRIVATE ERS_InputOutputSubsystem ERS_FramerateManager - ERS_ModelWriter ERS_CLASS_LoggingSystem ERS_CLASS_HardwareInformation diff --git a/Source/Core/Structures/ERS_STRUCT_SystemUtils/ERS_STRUCT_SystemUtils.h b/Source/Core/Structures/ERS_STRUCT_SystemUtils/ERS_STRUCT_SystemUtils.h index 61cdb3b312..09f917789f 100644 --- a/Source/Core/Structures/ERS_STRUCT_SystemUtils/ERS_STRUCT_SystemUtils.h +++ b/Source/Core/Structures/ERS_STRUCT_SystemUtils/ERS_STRUCT_SystemUtils.h @@ -18,7 +18,6 @@ #include #include -#include #include @@ -40,7 +39,6 @@ struct ERS_STRUCT_SystemUtils { std::unique_ptr Logger_; /** ERS_IOSubsystem_; /** ERS_ModelWriter_; /** FramerateManager_; /** ERS_CLASS_HardwareInformation_; /** ERS_CLASS_PythonInterpreterIntegration_; /** ModelWriter_; /** ModelLoader_; /** ERS_ModelWriter_; /** Date: Wed, 31 Aug 2022 22:31:58 +0000 Subject: [PATCH 61/63] Refactor CMake --- .../ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.cpp | 6 ++++++ Source/Main.cpp | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/Core/Utils/ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.cpp b/Source/Core/Utils/ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.cpp index 0a18c5d8cd..02f46cb6ee 100644 --- a/Source/Core/Utils/ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.cpp +++ b/Source/Core/Utils/ERS_CLASS_ModelImporter/ERS_CLASS_ModelImporter.cpp @@ -18,6 +18,12 @@ ERS_CLASS_ModelImporter::ERS_CLASS_ModelImporter(ERS_STRUCT_SystemUtils* SystemU ImportThread_ = std::thread(&ERS_CLASS_ModelImporter::ImportThread, this); SystemUtils_->Logger_->Log("Started Asset Import Thread", 3); + ERS_ModelWriter_ = std::make_unique( + SystemUtils->Logger_.get(), + SystemUtils->ERS_IOSubsystem_.get() + ); + + } diff --git a/Source/Main.cpp b/Source/Main.cpp index e3a2e01e46..f76aed0ec4 100644 --- a/Source/Main.cpp +++ b/Source/Main.cpp @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -104,12 +103,6 @@ int main(int NumArguments, char** ArguemntValues) { *SystemUtils->LocalSystemConfiguration_.get(), SystemUtils->Arguments_ ); - - SystemUtils->ERS_ModelWriter_ = std::make_unique( - SystemUtils->Logger_.get(), - SystemUtils->ERS_IOSubsystem_.get() - ); - SystemUtils->ERS_CLASS_HardwareInformation_ = std::make_unique( SystemUtils->Logger_.get(), *SystemUtils->LocalSystemConfiguration_.get() From fe5d54d2af5b0ebab09358eb88a3385ecccd04ab Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:35:31 +0000 Subject: [PATCH 62/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt index 06ccc36f59..b369ca9e0b 100644 --- a/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_SceneCamera/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries(ERS_STRUCT_SceneCamera PRIVATE # Link Internal Libs target_link_libraries(ERS_STRUCT_SceneCamera PRIVATE ERS_STRUCT_Camera - ERS_CLASS_VisualRenderer ) From a08a78583397c468d26578976671334212eecd53 Mon Sep 17 00:00:00 2001 From: datacrystals Date: Wed, 31 Aug 2022 22:35:57 +0000 Subject: [PATCH 63/63] Refactor CMake --- Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt b/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt index 72f394259c..a3396decd9 100644 --- a/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt +++ b/Source/Core/Structures/ERS_STRUCT_Viewport/CMakeLists.txt @@ -22,8 +22,6 @@ target_link_libraries(ERS_STRUCT_Viewport PRIVATE # Link Internal Libs target_link_libraries(ERS_STRUCT_Viewport PRIVATE ERS_STRUCT_Camera - - ERS_CLASS_VisualRenderer )