diff --git a/recipes/stella-cv-fbow/all/conandata.yml b/recipes/stella-cv-fbow/all/conandata.yml index 3c8aca7031136..d5970a3af3b2e 100644 --- a/recipes/stella-cv-fbow/all/conandata.yml +++ b/recipes/stella-cv-fbow/all/conandata.yml @@ -7,3 +7,6 @@ patches: - patch_file: "patches/001-avoid-opencv-overlinking.patch" patch_description: "Avoid overlinking of OpenCV libraries" patch_type: "conan" + - patch_file: "patches/002-support-apple-clang.patch" + patch_description: "Add support for apple-clang" + patch_type: "portability" diff --git a/recipes/stella-cv-fbow/all/conanfile.py b/recipes/stella-cv-fbow/all/conanfile.py index 0eab558ee517f..c879e96f13fcc 100644 --- a/recipes/stella-cv-fbow/all/conanfile.py +++ b/recipes/stella-cv-fbow/all/conanfile.py @@ -47,7 +47,7 @@ def export_sources(self): def config_options(self): if self.settings.os == "Windows": del self.options.fPIC - if self.settings.arch not in ["x86", "x86_64"]: + if self.settings.arch not in ["x86", "x86_64"] or self.settings.compiler not in ["gcc", "clang", "apple-clang"]: del self.options.avx del self.options.mmx del self.options.sse diff --git a/recipes/stella-cv-fbow/all/patches/002-support-apple-clang.patch b/recipes/stella-cv-fbow/all/patches/002-support-apple-clang.patch new file mode 100644 index 0000000000000..df96b96ef1dc7 --- /dev/null +++ b/recipes/stella-cv-fbow/all/patches/002-support-apple-clang.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -130,7 +130,7 @@ + set(EXTRA_EXE_LINKER_FLAGS_RELEASE "") + set(EXTRA_EXE_LINKER_FLAGS_DEBUG "") + +-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR MINGW) ++if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "AppleClang") + # profiling option + set(ENABLE_PROFILING OFF CACHE BOOL "Enable profiling in the GCC/Clang compiler (Add flags: -g -pg)") + # option for omitting frame pointer