Skip to content

Commit f9762e6

Browse files
committed
build(cmake): fix cmake compiler flag initialization
1 parent 56640ce commit f9762e6

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ add_compile_options("$<$<NOT:$<COMPILE_LANGUAGE:ASM_MASM>>:${DEFAULT_COMPILER_FL
6363
add_link_options("${DEFAULT_SHARED_LINKER_FLAGS}" "${DEFAULT_EXE_LINKER_FLAGS}")
6464
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
6565

66-
# Compiler flags are now initialized by ue4ss_initialize_project()
67-
list(APPEND Game_FLAGS "")
68-
list(APPEND CasePreserving_FLAGS ${Game_FLAGS})
69-
list(APPEND LessEqual421_FLAGS ${Game_FLAGS})
66+
# Initialize Compiler flags after compiler detection.
67+
# Uses ue4ss_initialize_compiler_flags() from cmake/modules/Utilities.cmake
68+
ue4ss_initialize_compiler_flags()
7069

7170
# Build configurations are now defined in ProjectConfig.cmake
7271
# Generate build configurations

cmake/modules/ProjectConfig.cmake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ set(UE4SS_Game_DEFINITIONS UE_GAME)
3030
set(UE4SS_CasePreserving_DEFINITIONS ${UE4SS_Game_DEFINITIONS} WITH_CASE_PRESERVING_NAME)
3131
set(UE4SS_LessEqual421_DEFINITIONS ${UE4SS_Game_DEFINITIONS} FNAME_ALIGN8)
3232

33+
# Target type flags (can be customized per target)
34+
set(UE4SS_Game_FLAGS "")
35+
set(UE4SS_CasePreserving_FLAGS ${UE4SS_Game_FLAGS})
36+
set(UE4SS_LessEqual421_FLAGS ${UE4SS_Game_FLAGS})
37+
3338
# Configuration type definitions (UE4-style)
3439
set(UE4SS_Debug_DEFINITIONS UE_BUILD_DEBUG)
3540
set(UE4SS_Dev_DEFINITIONS UE_BUILD_DEVELOPMENT STATS)
@@ -75,9 +80,10 @@ function(ue4ss_initialize_project)
7580
set(CONFIGURATION_TYPES ${UE4SS_CONFIGURATION_TYPES} PARENT_SCOPE)
7681
set(PLATFORM_TYPES ${UE4SS_PLATFORM_TYPES} PARENT_SCOPE)
7782

78-
# Set up definitions for each type
83+
# Set up definitions and flags for each type
7984
foreach(target_type ${UE4SS_TARGET_TYPES})
8085
set(${target_type}_DEFINITIONS ${UE4SS_${target_type}_DEFINITIONS} PARENT_SCOPE)
86+
set(${target_type}_FLAGS ${UE4SS_${target_type}_FLAGS} PARENT_SCOPE)
8187
endforeach()
8288

8389
foreach(config_type ${UE4SS_CONFIGURATION_TYPES})
@@ -90,9 +96,6 @@ function(ue4ss_initialize_project)
9096
set(${platform_type}_VARS ${UE4SS_${platform_type}_VARS} PARENT_SCOPE)
9197
endif()
9298
endforeach()
93-
94-
# Initialize compiler flags
95-
ue4ss_initialize_compiler_flags()
9699
endfunction()
97100

98101
# Initializes compiler flags based on configuration

0 commit comments

Comments
 (0)