Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

349 cmake failing #350

Merged
merged 63 commits into from
Aug 31, 2022
Merged

349 cmake failing #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
1ade41f
Refactor CMake
datacrystals Aug 31, 2022
e4875e9
Refactor CMake
datacrystals Aug 31, 2022
7c58f0d
Refactor CMake
datacrystals Aug 31, 2022
4d02b98
Refactor CMake
datacrystals Aug 31, 2022
1821a25
Refactor CMake
datacrystals Aug 31, 2022
742f603
Refactor CMake
datacrystals Aug 31, 2022
eaa0424
Refactor CMake
datacrystals Aug 31, 2022
75eab39
Refactor CMake
datacrystals Aug 31, 2022
db6c705
Refactor CMake
datacrystals Aug 31, 2022
92dc955
Refactor CMake
datacrystals Aug 31, 2022
2cfa64b
Refactor CMake
datacrystals Aug 31, 2022
42b7e04
Refactor CMake
datacrystals Aug 31, 2022
7feba83
Refactor CMake
datacrystals Aug 31, 2022
312749d
Refactor CMake
datacrystals Aug 31, 2022
22a2bdd
Refactor CMake
datacrystals Aug 31, 2022
e97f2ec
Refactor CMake
datacrystals Aug 31, 2022
cbfbf99
Refactor CMake
datacrystals Aug 31, 2022
d6c0972
Refactor CMake
datacrystals Aug 31, 2022
90259c9
Refactor CMake
datacrystals Aug 31, 2022
07a2078
Refactor CMake
datacrystals Aug 31, 2022
442df33
Refactor CMake
datacrystals Aug 31, 2022
d60cd27
Refactor CMake
datacrystals Aug 31, 2022
2581ba6
Refactor CMake
datacrystals Aug 31, 2022
a286430
Refactor CMake
datacrystals Aug 31, 2022
6984106
Refactor CMake
datacrystals Aug 31, 2022
ea62202
Refactor CMake
datacrystals Aug 31, 2022
d6f0b02
Refactor CMake
datacrystals Aug 31, 2022
b2fbbe5
Refactor CMake
datacrystals Aug 31, 2022
d1bdfab
Refactor CMake
datacrystals Aug 31, 2022
d669d95
Refactor CMake
datacrystals Aug 31, 2022
da29150
Refactor CMake
datacrystals Aug 31, 2022
6fe1243
Refactor CMake
datacrystals Aug 31, 2022
8f320ca
Refactor CMake
datacrystals Aug 31, 2022
6ba66eb
Refactor CMake
datacrystals Aug 31, 2022
40bd215
Refactor CMake
datacrystals Aug 31, 2022
5b0a911
Refactor CMake
datacrystals Aug 31, 2022
8e10b04
Refactor CMake
datacrystals Aug 31, 2022
30e79f6
Refactor CMake
datacrystals Aug 31, 2022
51d2ce1
Refactor CMake
datacrystals Aug 31, 2022
4fa97cd
Refactor CMake
datacrystals Aug 31, 2022
1350e7e
Refactor CMake
datacrystals Aug 31, 2022
278c766
Refactor CMake
datacrystals Aug 31, 2022
09bb51a
Refactor CMake
datacrystals Aug 31, 2022
275994f
Refactor CMake
datacrystals Aug 31, 2022
3321a98
Refactor CMake
datacrystals Aug 31, 2022
e17b68e
Refactor CMake
datacrystals Aug 31, 2022
37c13bc
Refactor CMake
datacrystals Aug 31, 2022
2e7e442
Refactor CMake
datacrystals Aug 31, 2022
2b629d9
Refactor CMake
datacrystals Aug 31, 2022
2c1789a
Refactor CMake
datacrystals Aug 31, 2022
d54f674
Refactor CMake
datacrystals Aug 31, 2022
f486e96
Refactor CMake
datacrystals Aug 31, 2022
b85a110
Refactor CMake
datacrystals Aug 31, 2022
1be572f
Refactor CMake
datacrystals Aug 31, 2022
55e50fa
Refactor CMake
datacrystals Aug 31, 2022
197b5d7
Refactor CMake
datacrystals Aug 31, 2022
3fa974f
Refactor CMake
datacrystals Aug 31, 2022
320eea6
Refactor CMake
datacrystals Aug 31, 2022
705c0df
Refactor CMake
datacrystals Aug 31, 2022
b0239ee
Refactor CMake
datacrystals Aug 31, 2022
e5c9b6d
Refactor CMake
datacrystals Aug 31, 2022
fe5d54d
Refactor CMake
datacrystals Aug 31, 2022
a08a785
Refactor CMake
datacrystals Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/Core/Editor/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_FontManager/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_LayoutManager/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_ThemeManager/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_UserProfileManager/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Utils/ERS_Editor_WindowManager/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_AssetExplorer/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_AssetStreamingSettings/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_ControllerSettings/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_EditorCameraSettings/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FontSelector/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FrameLatencyGraph/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FramerateCounter/CMakeLists.txt
View file
Open in desktop
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 ./)
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FramerateGraph/CMakeLists.txt
View file
Open in desktop
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 ./)
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FramerateHistogram/CMakeLists.txt
View file
Open in desktop
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 ./)
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_FrameratePlot/CMakeLists.txt
View file
Open in desktop
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 ./)
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_ImportModel/CMakeLists.txt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions Source/Core/Editor/Windows/GUI_Window_ImportModelDirectory/CMakeLists.txt
View file
Open in desktop
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