Merge pull request #1612 from dpogue/ide-folders

Create folder hierarchy in IDE project views
H-uru · Aug 11, 2024 · 1bc8f17 · 1bc8f17
2 parents 1159c5e + 092ff51
commit 1bc8f17
Show file tree

Hide file tree

Showing 114 changed files with 326 additions and 75 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,9 @@ set(PRODUCT_UUID        "ea489821-6c35-4bd0-9dae-bb17c585e680"
 option(PRODUCT_EMBED_BUILD_INFO "Embed build revision information into plProduct" ON)
 cmake_dependent_option(PRODUCT_EMBED_BUILD_TIME "Embed build time into plProduct" ON [[PRODUCT_EMBED_BUILD_INFO]] OFF)
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(CMAKE_FOLDER "CMakePredefinedTargets")
+
 # HeadSpin Configuration
 
 # Define HS_DEBUGGING for debug builds
@@ -188,6 +191,7 @@ include_directories(${PROJECT_BINARY_DIR})
 if(PLASMA_BUILD_TOOLS)
     # Custom dummy target for compiling all tools
     add_custom_target(tools)
+    set_target_properties(tools PROPERTIES XCODE_GENERATE_SCHEME TRUE)
 endif()
 
 include(TestBigEndian)
@@ -205,12 +209,8 @@ set(PLASMA_SOURCE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/Sources/Plasma")
 set(PLASMA_TOOLS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/Sources/Tools")
 set(PLASMA_MAX_PLUGIN_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/Sources/MaxPlugin")
 
-add_subdirectory(Scripts)
 add_subdirectory(Sources/Plasma)
-
-if(PLASMA_BUILD_TOOLS)
-    add_subdirectory(Sources/Tools)
-endif()
+add_subdirectory(Scripts)
 
 if(PLASMA_BUILD_MAX_PLUGIN)
     add_subdirectory(Sources/MaxPlugin)
@@ -222,6 +222,10 @@ if(PLASMA_BUILD_TESTS)
     add_subdirectory(Sources/Tests EXCLUDE_FROM_ALL)
 endif(PLASMA_BUILD_TESTS)
 
+if(PLASMA_BUILD_TOOLS)
+    add_subdirectory(Sources/Tools)
+endif()
+
 # This must be called only after all Qt targets are declared
 plasma_deploy_qt()
 

diff --git a/Scripts/CMakeLists.txt b/Scripts/CMakeLists.txt
@@ -9,6 +9,7 @@ source_group("Ages" FILES ${GameData})
 add_custom_target(Scripts
                   SOURCES ${GameScripts} ${GameSDL} ${GameData}
 )
+set_target_properties(Scripts PROPERTIES FOLDER "")
 
 install(
     DIRECTORY "Python/"

diff --git a/Sources/MaxPlugin/MaxComponent/CMakeLists.txt b/Sources/MaxPlugin/MaxComponent/CMakeLists.txt
@@ -166,6 +166,7 @@ set(MaxComponent_SOURCES
 )
 
 plasma_library(MaxComponent
+    FOLDER MaxPlugin
     SOURCES ${MaxComponent_HEADERS} ${MaxComponent_RESOURCES} ${MaxComponent_SOURCES}
     UNITY_BUILD
     PRECOMPILED_HEADERS Pch.h

diff --git a/Sources/MaxPlugin/MaxConvert/CMakeLists.txt b/Sources/MaxPlugin/MaxConvert/CMakeLists.txt
@@ -37,6 +37,7 @@ set(MaxConvert_SOURCES
 )
 
 plasma_library(MaxConvert
+    FOLDER MaxPlugin
     SOURCES ${MaxConvert_HEADERS} ${MaxConvert_SOURCES}
     PRECOMPILED_HEADERS Pch.h
     NO_SANITIZE # The 3ds Max headers are full of clang diagnostic errors.

diff --git a/Sources/MaxPlugin/MaxExport/CMakeLists.txt b/Sources/MaxPlugin/MaxExport/CMakeLists.txt
@@ -18,6 +18,7 @@ set(MaxExport_SOURCES
 )
 
 plasma_library(MaxExport
+    FOLDER MaxPlugin
     SOURCES ${MaxExport_HEADERS} ${MaxExport_SOURCES}
     PRECOMPILED_HEADERS Pch.h
     NO_SANITIZE # The 3ds Max headers are full of clang diagnostic errors.

diff --git a/Sources/MaxPlugin/MaxMain/CMakeLists.txt b/Sources/MaxPlugin/MaxMain/CMakeLists.txt
@@ -69,6 +69,7 @@ set(MaxMain_SOURCES
 )
 
 plasma_library(MaxMain SHARED
+    FOLDER MaxPlugin
     SOURCES ${MaxMain_HEADERS} ${MaxMain_RESOURCES} ${MaxMain_SOURCES}
     PRECOMPILED_HEADERS Pch.h
     NO_SANITIZE # The 3ds Max headers are full of clang diagnostic errors.

diff --git a/Sources/MaxPlugin/MaxPlasmaLights/CMakeLists.txt b/Sources/MaxPlugin/MaxPlasmaLights/CMakeLists.txt
@@ -23,6 +23,7 @@ set(MaxPlasmaLights_SOURCES
 )
 
 plasma_library(MaxPlasmaLights SHARED
+    FOLDER MaxPlugin
     SOURCES ${MaxPlasmaLights_HEADERS} ${MaxPlasmaLights_RESOURCES} ${MaxPlasmaLights_SOURCES}
     PRECOMPILED_HEADERS Pch.h
     NO_SANITIZE # The 3ds Max headers are full of clang diagnostic errors.

diff --git a/Sources/MaxPlugin/MaxPlasmaMtls/CMakeLists.txt b/Sources/MaxPlugin/MaxPlasmaMtls/CMakeLists.txt
@@ -105,6 +105,7 @@ set(MaxPlasmaMtls_SOURCES_Materials
 )
 
 plasma_library(MaxPlasmaMtls
+    FOLDER MaxPlugin
     SOURCES ${MaxPlasmaMtls_HEADERS}
             ${MaxPlasmaMtls_HEADERS_Layers}
             ${MaxPlasmaMtls_HEADERS_Materials}

diff --git a/Sources/Plasma/Apps/SoundDecompress/CMakeLists.txt b/Sources/Plasma/Apps/SoundDecompress/CMakeLists.txt
@@ -15,7 +15,10 @@ if(SoundDecompress_MOULa_Mode)
     list(APPEND SoundDecompress_HEADERS plOldAudioFileReader.h)
 endif()
 
-plasma_executable(SoundDecompress TOOL SOURCES ${SoundDecompress_SOURCES})
+plasma_executable(SoundDecompress TOOL
+    FOLDER Apps
+    SOURCES ${SoundDecompress_SOURCES}
+)
 target_link_libraries(
     SoundDecompress
     PRIVATE

diff --git a/Sources/Plasma/Apps/plClient/CMakeLists.txt b/Sources/Plasma/Apps/plClient/CMakeLists.txt
@@ -127,6 +127,7 @@ else()
 endif()
 
 plasma_executable(plClient CLIENT INSTALL_PDB
+    FOLDER Apps
     SOURCES
         ${plClient_SOURCES} ${plClient_HEADERS}
         ${plClient_TEXT} ${plClient_RESOURCES}

diff --git a/Sources/Plasma/Apps/plCrashHandler/CMakeLists.txt b/Sources/Plasma/Apps/plCrashHandler/CMakeLists.txt
@@ -7,7 +7,10 @@ set(plCrashHandler_RESOURCES
     resource.h
 )
 
-plasma_executable(plCrashHandler WIN32 CLIENT SOURCES ${plCrashHandler_SOURCES} ${plCrashHandler_RESOURCES})
+plasma_executable(plCrashHandler CLIENT
+    FOLDER Apps
+    SOURCES ${plCrashHandler_SOURCES} ${plCrashHandler_RESOURCES}
+)
 target_link_libraries(
     plCrashHandler
     PRIVATE

diff --git a/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt b/Sources/Plasma/Apps/plUruLauncher/CMakeLists.txt
@@ -16,7 +16,8 @@ set(plUruLauncher_RESOURCES
     Dirt.ICO
 )
 
-plasma_executable(plUruLauncher WIN32 CLIENT
+plasma_executable(plUruLauncher CLIENT
+    FOLDER Apps
     SOURCES
         ${plUruLauncher_SOURCES} ${plUruLauncher_HEADERS}
         ${plUruLauncher_RESOURCES}

diff --git a/Sources/Plasma/CoreLib/CMakeLists.txt b/Sources/Plasma/CoreLib/CMakeLists.txt
@@ -72,6 +72,7 @@ set(CoreLib_HEADERS
 )
 
 plasma_library(CoreLib
+    FOLDER CoreLib
     SOURCES ${CoreLib_SOURCES} ${CoreLib_HEADERS}
     PRECOMPILED_HEADERS _CoreLibPch.h
 )
@@ -113,4 +114,5 @@ add_custom_target(pcBuildInfo
     COMMAND ${BUILD_INFO_COMMAND}
     BYPRODUCTS "${BUILD_INFO_FILE}"
 )
+set_target_properties(pcBuildInfo PROPERTIES FOLDER CoreLib)
 add_dependencies(CoreLib pcBuildInfo)
diff --git a/Sources/Plasma/FeatureLib/inc/CMakeLists.txt b/Sources/Plasma/FeatureLib/inc/CMakeLists.txt
@@ -1,7 +1,10 @@
 set(pfFeatureInc_HEADERS
     pfAllCreatables.h
 )
-plasma_library(pfFeatureInc OBJECT SOURCES ${pfFeatureInc_HEADERS})
+plasma_library(pfFeatureInc OBJECT
+    FOLDER FeatureLib
+    SOURCES ${pfFeatureInc_HEADERS}
+)
 target_link_libraries(pfFeatureInc
     PUBLIC
         pfAnimation

diff --git a/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAnimation/CMakeLists.txt
@@ -25,7 +25,10 @@ set(pfAnimation_HEADERS
     plViewFaceModifier.h
 )
 
-plasma_library(pfAnimation SOURCES ${pfAnimation_SOURCES} ${pfAnimation_HEADERS})
+plasma_library(pfAnimation
+    FOLDER FeatureLib
+    SOURCES ${pfAnimation_SOURCES} ${pfAnimation_HEADERS}
+)
 target_link_libraries(
     pfAnimation
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfAudio/CMakeLists.txt
@@ -9,7 +9,10 @@ set(pfAudio_HEADERS
     plRandomSoundMod.h
 )
 
-plasma_library(pfAudio SOURCES ${pfAudio_SOURCES} ${pfAudio_HEADERS})
+plasma_library(pfAudio
+    FOLDER FeatureLib
+    SOURCES ${pfAudio_SOURCES} ${pfAudio_HEADERS}
+)
 target_link_libraries(
     pfAudio
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCamera/CMakeLists.txt
@@ -15,7 +15,10 @@ set(pfCamera_HEADERS
     plVirtualCamNeu.h
 )
 
-plasma_library(pfCamera SOURCES ${pfCamera_SOURCES} ${pfCamera_HEADERS})
+plasma_library(pfCamera
+    FOLDER FeatureLib
+    SOURCES ${pfCamera_SOURCES} ${pfCamera_HEADERS}
+)
 target_link_libraries(
     pfCamera
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCharacter/CMakeLists.txt
@@ -11,7 +11,10 @@ set(pfCharacter_HEADERS
     pfMarkerMgr.h
 )
 
-plasma_library(pfCharacter SOURCES ${pfCharacter_SOURCES} ${pfCharacter_HEADERS})
+plasma_library(pfCharacter
+    FOLDER FeatureLib
+    SOURCES ${pfCharacter_SOURCES} ${pfCharacter_HEADERS}
+)
 target_link_libraries(
     pfCharacter
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConditional/CMakeLists.txt
@@ -30,6 +30,7 @@ set(pfConditional_HEADERS
 )
 
 plasma_library(pfConditional
+    FOLDER FeatureLib
     SOURCES ${pfConditional_SOURCES} ${pfConditional_HEADERS}
     UNITY_BUILD
     PRECOMPILED_HEADERS Pch.h

diff --git a/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsole/CMakeLists.txt
@@ -17,6 +17,7 @@ set(pfConsole_HEADERS
 )
 
 plasma_library(pfConsole
+    FOLDER FeatureLib
     SOURCES ${pfConsole_SOURCES} ${pfConsole_HEADERS}
     PRECOMPILED_HEADERS Pch.h
 )

diff --git a/Sources/Plasma/FeatureLib/pfConsoleCore/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfConsoleCore/CMakeLists.txt
@@ -13,7 +13,10 @@ set(pfConsoleCore_HEADERS
     pfConsoleParser.h
 )
 
-plasma_library(pfConsoleCore SOURCES ${pfConsoleCore_SOURCES} ${pfConsoleCore_HEADERS})
+plasma_library(pfConsoleCore
+    FOLDER FeatureLib
+    SOURCES ${pfConsoleCore_SOURCES} ${pfConsoleCore_HEADERS}
+)
 target_link_libraries(
     pfConsoleCore
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfCrashHandler/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfCrashHandler/CMakeLists.txt
@@ -23,7 +23,10 @@ else()
     )
 endif()
 
-plasma_library(pfCrashHandler SOURCES ${pfCrashHandler_SOURCES} ${pfCrashHandler_HEADERS})
+plasma_library(pfCrashHandler
+    FOLDER FeatureLib
+    SOURCES ${pfCrashHandler_SOURCES} ${pfCrashHandler_HEADERS}
+)
 target_link_libraries(
     pfCrashHandler
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfDXPipeline/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfDXPipeline/CMakeLists.txt
@@ -28,6 +28,7 @@ set(pfDXPipeline_HEADERS
 )
 
 plasma_library(pfDXPipeline
+    FOLDER FeatureLib
     SOURCES ${pfDXPipeline_SOURCES} ${pfDXPipeline_HEADERS}
     PRECOMPILED_HEADERS Pch.h
 )

diff --git a/Sources/Plasma/FeatureLib/pfGLPipeline/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGLPipeline/CMakeLists.txt
@@ -14,7 +14,10 @@ set(pfGLPipeline_HEADERS
     plGLPlateManager.h
 )
 
-plasma_library(pfGLPipeline SOURCES ${pfGLPipeline_SOURCES} ${pfGLPipeline_HEADERS})
+plasma_library(pfGLPipeline
+    FOLDER FeatureLib
+    SOURCES ${pfGLPipeline_SOURCES} ${pfGLPipeline_HEADERS}
+)
 target_link_libraries(pfGLPipeline
     PUBLIC
         CoreLib

diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameGUIMgr/CMakeLists.txt
@@ -57,6 +57,7 @@ set(pfGameGUIMgr_HEADERS
 )
 
 plasma_library(pfGameGUIMgr
+    FOLDER FeatureLib
     SOURCES ${pfGameGUIMgr_SOURCES} ${pfGameGUIMgr_HEADERS}
     UNITY_BUILD
     PRECOMPILED_HEADERS Pch.h

diff --git a/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameMgr/CMakeLists.txt
@@ -15,7 +15,10 @@ set(pfGameMgr_SOURCES
     pfGmMarker.cpp
 )
 
-plasma_library(pfGameMgr SOURCES ${pfGameMgr_HEADERS} ${pfGameMgr_SOURCES})
+plasma_library(pfGameMgr
+    FOLDER FeatureLib
+    SOURCES ${pfGameMgr_HEADERS} ${pfGameMgr_SOURCES}
+)
 target_link_libraries(
     pfGameMgr
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfGameScoreMgr/CMakeLists.txt
@@ -6,7 +6,10 @@ set(pfGameScoreMgr_HEADERS
     pfGameScoreMgr.h
 )
 
-plasma_library(pfGameScoreMgr SOURCES ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS})
+plasma_library(pfGameScoreMgr
+    FOLDER FeatureLib
+    SOURCES ${pfGameScoreMgr_SOURCES} ${pfGameScoreMgr_HEADERS}
+)
 target_link_libraries(
     pfGameScoreMgr
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfJournalBook/CMakeLists.txt
@@ -7,7 +7,10 @@ set(pfJournalBook_HEADERS
     pfJournalBookCreatable.h
 )
 
-plasma_library(pfJournalBook SOURCES ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS})
+plasma_library(pfJournalBook
+    FOLDER FeatureLib
+    SOURCES ${pfJournalBook_SOURCES} ${pfJournalBook_HEADERS}
+)
 target_link_libraries(
     pfJournalBook
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfLocalizationMgr/CMakeLists.txt
@@ -18,7 +18,10 @@ set(pfLocalizationMgr_HEADERS
     pfLocalizedString.h
 )
 
-plasma_library(pfLocalizationMgr SOURCES ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS})
+plasma_library(pfLocalizationMgr
+    FOLDER FeatureLib
+    SOURCES ${pfLocalizationMgr_SOURCES} ${pfLocalizationMgr_HEADERS}
+)
 
 target_link_libraries(
     pfLocalizationMgr

diff --git a/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMessage/CMakeLists.txt
@@ -23,7 +23,10 @@ set(pfMessage_HEADERS
     plClothingMsg.h
 )
 
-plasma_library(pfMessage SOURCES ${pfMessage_SOURCES} ${pfMessage_HEADERS})
+plasma_library(pfMessage
+    FOLDER FeatureLib
+    SOURCES ${pfMessage_SOURCES} ${pfMessage_HEADERS}
+)
 target_link_libraries(
     pfMessage
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfMetalPipeline/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMetalPipeline/CMakeLists.txt
@@ -44,7 +44,10 @@ set(pfMetalPipeline_HEADERS
     pfMetalPipelineCreatable.h
 )
 
-plasma_library(pfMetalPipeline SOURCES ${pfMetalPipeline_SOURCES} ${pfMetalPipeline_HEADERS})
+plasma_library(pfMetalPipeline
+    FOLDER FeatureLib
+    SOURCES ${pfMetalPipeline_SOURCES} ${pfMetalPipeline_HEADERS}
+)
 target_link_libraries(pfMetalPipeline
     PUBLIC
         CoreLib
@@ -98,6 +101,7 @@ set_target_properties(pfMetalPipelineShadersMSL21 PROPERTIES
     XCODE_ATTRIBUTE_MTL_FAST_MATH "YES"
     XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=Debug] "INCLUDE_SOURCE"
     XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=RelWithDebInfo] "INCLUDE_SOURCE"
+    FOLDER FeatureLib
 )
 set_target_properties(pfMetalPipelineShadersMSL23 PROPERTIES
     XCODE_PRODUCT_TYPE com.apple.product-type.metal-library
@@ -108,6 +112,7 @@ set_target_properties(pfMetalPipelineShadersMSL23 PROPERTIES
     XCODE_ATTRIBUTE_MTL_FAST_MATH "YES"
     XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=Debug] "INCLUDE_SOURCE"
     XCODE_ATTRIBUTE_MTL_ENABLE_DEBUG_INFO[variant=RelWithDebInfo] "INCLUDE_SOURCE"
+    FOLDER FeatureLib
 )
 set_source_files_properties(${pfMetalPipeline_SHADERS} TARGET_DIRECTORY pfMetalPipelineShadersMSL21 PROPERTIES LANGUAGE METAL)
 set_source_files_properties(${pfMetalPipeline_SHADERS} TARGET_DIRECTORY pfMetalPipelineShadersMSL23 PROPERTIES LANGUAGE METAL)

diff --git a/Sources/Plasma/FeatureLib/pfMoviePlayer/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfMoviePlayer/CMakeLists.txt
@@ -8,7 +8,10 @@ set(pfMoviePlayer_HEADERS
     plPlanarImage.h
 )
 
-plasma_library(pfMoviePlayer SOURCES ${pfMoviePlayer_SOURCES} ${pfMoviePlayer_HEADERS})
+plasma_library(pfMoviePlayer
+    FOLDER FeatureLib
+    SOURCES ${pfMoviePlayer_SOURCES} ${pfMoviePlayer_HEADERS}
+)
 target_link_libraries(
     pfMoviePlayer
     PUBLIC

diff --git a/Sources/Plasma/FeatureLib/pfPasswordStore/CMakeLists.txt b/Sources/Plasma/FeatureLib/pfPasswordStore/CMakeLists.txt
@@ -15,7 +15,10 @@ elseif(TARGET Security::Security)
     list(APPEND pfPasswordStore_SOURCES pfPasswordStore_Apple.cpp)
 endif()
 
-plasma_library(pfPasswordStore SOURCES ${pfPasswordStore_HEADERS} ${pfPasswordStore_SOURCES})
+plasma_library(pfPasswordStore
+    FOLDER FeatureLib
+    SOURCES ${pfPasswordStore_HEADERS} ${pfPasswordStore_SOURCES}
+)
 target_link_libraries(
     pfPasswordStore
     PUBLIC