Skip to content

Commit 111e690

Browse files
committed
Hopefully, this'll resolve the issue where people force their own version of MSVCP140.dll instead of ours.
See actions/runner-images#10004 (comment) -- and that thread in general. Which is the same as an issue we _originally_ tried to work around by going with an older MSVC (which is what Lulzbot ended up going with) and when that turned out to not work, we just upgraded the entire chain to the new version. -- _However_ it now apprears that an antivirus vendor (McAfee) is forcing their own version of those DLL's, which are the older ones. -- So now try this workaround. CURA-12675
1 parent ccf276e commit 111e690

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

conanfile.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ def build_requirements(self):
119119

120120
def generate(self):
121121
tc = CMakeToolchain(self)
122+
123+
tc.preprocessor_definitions["_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"] = 1
124+
122125
if is_msvc(self):
123126
tc.variables["USE_MSVC_RUNTIME_LIBRARY_DLL"] = not is_msvc_static_runtime(self)
124127
tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
@@ -133,6 +136,9 @@ def generate(self):
133136

134137
def build(self):
135138
cmake = CMake(self)
139+
140+
cmake.definitions["_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR"] = 1
141+
136142
cmake.configure()
137143
cmake.build()
138144

0 commit comments

Comments
 (0)