eu07/maszyna
17
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-05 07:34:27 +01:00
Code Issues 156 Wiki Activity

let betterRenderer import the modules

Browse Source 
The module file set moves to its own eu07_modules library: a target can
only consume C++20 modules by linking the target that owns them, and
betterRenderer is a separate add_library. Its project includes become
imports.

CXX_EXTENSIONS must match across the two - a BMI built with -std=c++20
is refused by a unit compiled with -std=gnu++20.
This commit is contained in:
maj00r
2026-09-09 23:30:34 +02:00
parent ce5ee288ff
commit 06f6c6035b
19 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CMakeLists.txt
View File

@@ -484,11 +484,6 @@ if (NOT WITH_OPENVR)
list(REMOVE_ITEM MODULE_INTERFACES "${CMAKE_CURRENT_SOURCE_DIR}/vr/openvr_imp.cppm")
endif()
target_sources(${PROJECT_NAME}
PUBLIC FILE_SET CXX_MODULES
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES ${MODULE_INTERFACES})
set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)
@@ -664,6 +659,35 @@ if(WIN32 AND WITH_PYTHON)
)
endif()
# The module interface units live in their own library so that other targets --
# betterRenderer, which is a separate add_library -- can import them. A target
# can only consume C++20 modules by linking the target that owns the file set,
# and the executable's own modules are not reachable that way.
#
# The interfaces need exactly the flags the executable was given, so they are
# copied off it rather than restated; this has to happen after all the
# third-party wiring above and before betterRenderer is added, or the mirrored
# link list would point back at betterRenderer and make the dependency circular.
add_library(eu07_modules STATIC)
get_target_property(EU07_INCLUDES ${PROJECT_NAME} INCLUDE_DIRECTORIES)
get_target_property(EU07_DEFINITIONS ${PROJECT_NAME} COMPILE_DEFINITIONS)
get_target_property(EU07_LINKS ${PROJECT_NAME} LINK_LIBRARIES)
target_sources(eu07_modules
PUBLIC FILE_SET CXX_MODULES
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES ${MODULE_INTERFACES})
target_include_directories(eu07_modules PUBLIC ${EU07_INCLUDES})
target_compile_definitions(eu07_modules PUBLIC ${EU07_DEFINITIONS})
target_link_libraries(eu07_modules PUBLIC ${EU07_LINKS})
set_target_properties(eu07_modules PROPERTIES
CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF
POSITION_INDEPENDENT_CODE ON)
target_link_libraries(${PROJECT_NAME} eu07_modules)
if (WITH_BETTER_RENDERER)
add_subdirectory("betterRenderer")
set_target_properties(betterRenderer betterRenderer_fsr2 betterRenderer_shaders PROPERTIES FOLDER "renderers")