From a36a35c39ef4b83f0a8bdeca2cb2608933ccc1b8 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 17 Sep 2023 17:15:43 -0500 Subject: [PATCH 1/2] clean up folder display of optional core modules --- Tools/CMake/modules/afx.cmake | 2 +- Tools/CMake/modules/navigation.cmake | 6 ++++-- Tools/CMake/modules/tools.cmake | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Tools/CMake/modules/afx.cmake b/Tools/CMake/modules/afx.cmake index 00764637c..88c4c60d3 100644 --- a/Tools/CMake/modules/afx.cmake +++ b/Tools/CMake/modules/afx.cmake @@ -8,5 +8,5 @@ if(TORQUE_AFX_ENABLED) set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_AFX_SOURCES}) set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_AFX_ENABLED) - source_group("Modules/AFX" ${TORQUE_AFX_SOURCES}) + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/afx/" PREFIX "Modules/AFX" FILES ${TORQUE_AFX_SOURCES}) endif() diff --git a/Tools/CMake/modules/navigation.cmake b/Tools/CMake/modules/navigation.cmake index e0a480c3e..6a9da93ff 100644 --- a/Tools/CMake/modules/navigation.cmake +++ b/Tools/CMake/modules/navigation.cmake @@ -3,11 +3,13 @@ option(TORQUE_NAVIGATION "Enable Navigation module" ON) if(TORQUE_NAVIGATION) message("Enabling Navigation Module") - - torqueAddSourceDirectories("${CMAKE_SOURCE_DIR}/Engine/source/navigation") + + file(GLOB_RECURSE TORQUE_NAV_SOURCES "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.cpp" "${CMAKE_SOURCE_DIR}/Engine/source/navigation/*.h" ) + set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_NAV_SOURCES}) set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} recast) set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} recast TORQUE_NAVIGATION_ENABLED) # Since recast lives elsewhere we need to ensure it is known to Torque when providing a link to it add_subdirectory("${CMAKE_SOURCE_DIR}/Engine/lib/recast" ${CMAKE_BINARY_DIR}/temp/recast EXCLUDE_FROM_ALL) + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/navigation/" PREFIX "Modules/NAVIGATION" FILES ${TORQUE_NAV_SOURCES}) endif(TORQUE_NAVIGATION) diff --git a/Tools/CMake/modules/tools.cmake b/Tools/CMake/modules/tools.cmake index a1c0a1b4f..3b00e4e5c 100644 --- a/Tools/CMake/modules/tools.cmake +++ b/Tools/CMake/modules/tools.cmake @@ -4,8 +4,8 @@ option(TORQUE_TOOLS "Enable Torque Tools" ON) if(TORQUE_TOOLS) message("Enabling Torque Tools Module") - file(GLOB TORQUE_TOOLS_SOURCES "gui/editor/*.cpp" "gui/worldEditor/*.cpp" "gui/worldEditor/tools/*.cpp" - "gui/editor/inspector/*.cpp") + file(GLOB_RECURSE TORQUE_TOOLS_SOURCES "gui/editor/*.cpp" "gui/worldEditor/*.cpp") set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_TOOLS_SOURCES}) set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TOOLS) + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/gui/" PREFIX "Modules/TOOLS" FILES ${TORQUE_TOOLS_SOURCES}) endif(TORQUE_TOOLS) From 62f4d443d5d8c4ec22459c802d33cdc417766f87 Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Sun, 17 Sep 2023 18:29:10 -0500 Subject: [PATCH 2/2] more tools pseudo-module incorporation cleanup --- Tools/CMake/modules/tools.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Tools/CMake/modules/tools.cmake b/Tools/CMake/modules/tools.cmake index 3b00e4e5c..070c4e15b 100644 --- a/Tools/CMake/modules/tools.cmake +++ b/Tools/CMake/modules/tools.cmake @@ -4,8 +4,14 @@ option(TORQUE_TOOLS "Enable Torque Tools" ON) if(TORQUE_TOOLS) message("Enabling Torque Tools Module") - file(GLOB_RECURSE TORQUE_TOOLS_SOURCES "gui/editor/*.cpp" "gui/worldEditor/*.cpp") - set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_TOOLS_SOURCES}) + file(GLOB_RECURSE TORQUE_TOOLS_SOURCES "gui/editor/*.cpp" "gui/editor/*.h" "gui/worldEditor/*.cpp" "gui/worldEditor/*.h") + file(GLOB_RECURSE TORQUE_TOOLS_SOURCES2 "environment/editors/*.cpp" "environment/editors/*.h") + file(GLOB_RECURSE TORQUE_TOOLS_SOURCES3 "forest/editor/*.cpp" "forest/editor/*.h") + + set(TORQUE_SOURCE_FILES ${TORQUE_SOURCE_FILES} ${TORQUE_TOOLS_SOURCES} ${TORQUE_TOOLS_SOURCES2} ${TORQUE_TOOLS_SOURCES3}) set(TORQUE_COMPILE_DEFINITIONS ${TORQUE_COMPILE_DEFINITIONS} TORQUE_TOOLS) - source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/gui/" PREFIX "Modules/TOOLS" FILES ${TORQUE_TOOLS_SOURCES}) + #VS display + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/gui/" PREFIX "Modules/TOOLS/gui" FILES ${TORQUE_TOOLS_SOURCES}) + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/environment/editors/" PREFIX "Modules/TOOLS/environment" FILES ${TORQUE_TOOLS_SOURCES2}) + source_group(TREE "${CMAKE_SOURCE_DIR}/Engine/source/forest/editor/" PREFIX "Modules/TOOLS/forest" FILES ${TORQUE_TOOLS_SOURCES3}) endif(TORQUE_TOOLS)