Skip to content

Commit c819f08

Browse files
committed
Windows: fix xapian-core compilation (for doxygen)
1 parent dd04537 commit c819f08

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

conan-profiles/conan-profile-Windows-X64

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ tools.build:cxxflags=["/openmp", "/MP", "/DEBUG:NONE", "/O2", "/arch:AVX"]
1919
tools.build:cflags=["/openmp", "/MP", "/DEBUG:NONE", "/O2", "/arch:AVX"]
2020
embree3/*:tools.build:cxxflags=["/openmp", "/MP", "/DEBUG:NONE", "/O2"]
2121

22-
# libiconv/*:tools.microsoft.bash:path=C:\msys64\usr\bin\bash.exe
23-
# libiconv/*:tools.microsoft.bash:subsystem=msys2
22+
# Following deps are to be compiled with msys2/gcc: MSVC flags will not do
2423
libiconv/*:tools.build:cxxflags=!
2524
libiconv/*:tools.build:cflags=!
25+
xapian-core/*:tools.build:cxxflags=!
26+
xapian-core/*:tools.build:cflags=!
27+
xapian-core/*:compiler.cppstd=14
2628

2729
[options]
2830
# MSVC does not support avx2 nor avx512

local-conan-recipes/opensubdiv/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ def generate(self):
144144
tc.variables["NO_GLTESTS"] = True
145145
tc.variables["NO_MACOS_FRAMEWORK"] = True
146146
tc.cache_variables["CMAKE_VERBOSE_MAKEFILE"] = True
147+
tc.cache_variables["OPENMP_FOUND"] = True # Force OpenMP
147148
tc.generate()
148149

149150
deps = CMakeDeps(self)

0 commit comments

Comments
 (0)