Skip to content

Commit 533d5bc

Browse files
committed
Attempt to fix Windows CI by matching Jolt's build setup.
1 parent 90676fb commit 533d5bc

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

attachments/advanced_gltf/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,9 @@ if(MSVC)
256256

257257
# Enable Link Time Code Generation to match Jolt and resolve potential LTO mismatches
258258
set_target_properties(SimpleEngineLib PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
259-
set_target_properties(AdvancedGLTF PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
260259

261260
# Jolt configuration consistency
262261
target_compile_definitions(SimpleEngineLib PUBLIC JPH_PROFILE_ENABLED JPH_EXTERNAL_PROFILE)
263-
target_compile_definitions(AdvancedGLTF PRIVATE JPH_PROFILE_ENABLED JPH_EXTERNAL_PROFILE)
264262
elseif(WIN32)
265263
target_compile_definitions(SimpleEngineLib PUBLIC
266264
NOMINMAX WIN32_LEAN_AND_MEAN _CRT_SECURE_NO_WARNINGS)
@@ -284,6 +282,11 @@ target_link_libraries(AdvancedGLTF PRIVATE
284282
Jolt
285283
glm::glm)
286284

285+
if(MSVC)
286+
set_target_properties(AdvancedGLTF PROPERTIES INTERPROCEDURAL_OPTIMIZATION TRUE)
287+
target_compile_definitions(AdvancedGLTF PRIVATE JPH_PROFILE_ENABLED JPH_EXTERNAL_PROFILE)
288+
endif()
289+
287290
# Ensure all shaders (from simple_engine and local) are in the executable's shader directory.
288291
add_dependencies(AdvancedGLTF advanced_gltf_shaders)
289292

0 commit comments

Comments
 (0)