build(cmake): also fix linker flags and folder organization propagation

Author: narknon

cmake/modules/IDEOrganization.cmake

@@ -121,7 +121,17 @@ function(organize_targets_by_source_dir)
     # Get all targets in the project
     set(ALL_TARGETS "")
     get_all_targets_recursive(ALL_TARGETS ${CMAKE_SOURCE_DIR})
-    
+
+    # Determine the base directory to use for path matching
+    # When used as a subdirectory, use PROJECT_SOURCE_DIR instead of CMAKE_SOURCE_DIR
+    if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+        # We are the root project
+        set(BASE_SOURCE_DIR "${CMAKE_SOURCE_DIR}")
+    else()
+        # We are a subdirectory of another project
+        set(BASE_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
+    endif()
+
     # Organize targets in IDE folders
     foreach(target ${ALL_TARGETS})
         # Skip non-target entries
@@ -141,12 +151,12 @@ function(organize_targets_by_source_dir)
         if(TARGET_TYPE STREQUAL "UTILITY")
             continue()  # Skip utility targets
         endif()
-        
+
         # Standard organization based on source directory
         get_target_property(TARGET_SOURCE_DIR ${target} SOURCE_DIR)
         if(TARGET_SOURCE_DIR)
-            string(REPLACE "${CMAKE_SOURCE_DIR}/" "" REL_SOURCE_DIR "${TARGET_SOURCE_DIR}")
-            
+            string(REPLACE "${BASE_SOURCE_DIR}/" "" REL_SOURCE_DIR "${TARGET_SOURCE_DIR}")
+
             # Categorize targets
             if(REL_SOURCE_DIR MATCHES "^deps/first")
                 set_target_properties(${target} PROPERTIES FOLDER "deps/first")

cmake/modules/Utilities.cmake

@@ -38,6 +38,9 @@ endfunction()
 #   TARGET_COMPILE_DEFINITIONS - Compile definitions for each configuration
 #
 function(generate_build_configurations)
+    # Determine if we're using a multi-config generator (Visual Studio, Xcode) or single-config (Ninja, Makefiles)
+    get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
     # These variables will be built up in _LOCAL variants and set in parent scope at the end
     set(TARGET_COMPILE_OPTIONS_LOCAL "")
     set(TARGET_LINK_OPTIONS_LOCAL "")
@@ -97,7 +100,10 @@ function(generate_build_configurations)
                     # Append to existing flags to preserve CMake's defaults (including standard libraries)
                     set(CMAKE_EXE_LINKER_FLAGS_${triplet_upper} "${CMAKE_EXE_LINKER_FLAGS_${triplet_upper}} ${exe_linker_flags}" CACHE STRING "" FORCE)
                     set(CMAKE_SHARED_LINKER_FLAGS_${triplet_upper} "${CMAKE_SHARED_LINKER_FLAGS_${triplet_upper}} ${shared_linker_flags}" CACHE STRING "" FORCE)
-                    list(APPEND TARGET_LINK_OPTIONS_LOCAL "$<$<STREQUAL:$<CONFIG>,${triplet}>:${linker_flags}>")
+                    # Include default linker flags for propagation to external consumers
+                    # UE4SS is a SHARED library, so use DEFAULT_SHARED_LINKER_FLAGS (which is currently empty)
+                    # But also include DEFAULT_EXE_LINKER_FLAGS (/DEBUG:FULL) for completeness
+                    list(APPEND TARGET_LINK_OPTIONS_LOCAL "$<$<STREQUAL:$<CONFIG>,${triplet}>:${DEFAULT_EXE_LINKER_FLAGS};${linker_flags}>")
                 elseif("${CMAKE_BUILD_TYPE}" STREQUAL "${triplet}")
                     # For single-config, append to base flags (don't use TARGET_LINK_OPTIONS to avoid duplication)
                     # Preserve CMake's defaults including standard libraries