Skip to content

Disable optimizations for gltf_decoder.cc in MSVC builds. #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 11, 2022
Merged

Disable optimizations for gltf_decoder.cc in MSVC builds. #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27e2aa4
Disable optimizations for gltf_decoder.cc in MSVC builds.
tomfinegan Mar 10, 2022
3a60b4c
Remove more MSVC flags.
tomfinegan Mar 10, 2022
38747a6
Remove flags before adding flags.
tomfinegan Mar 10, 2022
8e36fdc
Set props before creating targets.
tomfinegan Mar 10, 2022
14f8ad5
Set COMPILE_OPTIONS prop instead of the CMAKE_CXX_FLAGS_<CONFIG> prop
tomfinegan Mar 10, 2022
7bbca82
Only add flags
tomfinegan Mar 10, 2022
75965dc
Boo: Cannot actually replace per-source-file options, only add. Bad, …
tomfinegan Mar 10, 2022
2dec142
Correct the COMPILE_OPTIONS property name.
tomfinegan Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,7 @@ jobs:
-DDRACO_TESTS=ON \
-DDRACO_TRANSCODER_SUPPORTED=ON
cmake_build_command: cmake --build . --config Release -- -m:2
# TODO(https://github.com/google/draco/issues/826)
draco_test_command: |-
Release/draco_tests \
--gtest_filter=-GltfDecoderTest.ThreeMeshesOneNoMaterialMesh

draco_test_command: Release/draco_tests

- test_name: windows-msvc-release-static
os: windows-2019
Expand All @@ -189,11 +185,7 @@ jobs:
-DDRACO_TESTS=ON \
-DDRACO_TRANSCODER_SUPPORTED=ON
cmake_build_command: cmake --build . --config Release -- -m:2
# TODO(https://github.com/google/draco/issues/826)
draco_test_command: |-
Release/draco_tests \
--gtest_filter=-GltfDecoderTest.ThreeMeshesOneNoMaterialMesh

draco_test_command: Release/draco_tests

- test_name: windows-make-release-shared
os: windows-2019
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,13 @@ else()
${draco_include_paths})

if(DRACO_TRANSCODER_SUPPORTED)
if(MSVC)
# TODO(https://github.com/google/draco/issues/826)
set_source_files_properties(
"${draco_src_root}/io/gltf_decoder.cc"
PROPERTIES COMPILE_OPTIONS "/Od")
endif()

draco_add_library(
NAME
draco_material
Expand Down