Skip to content

Commit

Permalink
Merge pull request #350 from carboncopies/349-cmake-failing
Browse files Browse the repository at this point in the history
349 cmake failing
  • Loading branch information
datacrystals authored Aug 31, 2022
2 parents 610f2a0 + a08a785 commit e4c6f42
Show file tree
Hide file tree
Showing 93 changed files with 187 additions and 191 deletions.
4 changes: 2 additions & 2 deletions Source/Core/Editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ add_library(VisualEditor
)

# Link 3rd Party Libs
target_link_libraries(VisualEditor
target_link_libraries(VisualEditor PRIVATE
glad
glfw
IMGUI
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Menus/GUI_Menu_Debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Menus/GUI_Menu_File/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Menus/GUI_Menu_Settings/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Menus/GUI_Menu_Window/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_3DCursor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_About/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./)
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./)
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./)
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit e4c6f42

Please sign in to comment.