From 139a989d26cdfc8ac8cb068c100f751a0893259a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sun, 21 May 2017 11:13:02 +0200 Subject: caffe: BLAS fix for Haiku diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 4a5bac4..81d5e83 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -105,6 +105,7 @@ if(USE_OPENCV) endif() # ---[ BLAS +if(NOT HAIKU) if(NOT APPLE) set(BLAS "Atlas" CACHE STRING "Selected BLAS library") set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL") @@ -134,6 +135,11 @@ elseif(APPLE) endif() endif() endif() +elseif(HAIKU) + find_package(OpenBLAS REQUIRED) + list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${OpenBLAS_INCLUDE_DIR}) + list(APPEND Caffe_LINKER_LIBS PUBLIC ${OpenBLAS_LIB}) +endif() # ---[ Python if(BUILD_python) -- 2.35.1 From 49cef6571ae08954895889d2c69b4dc9fe48c856 Mon Sep 17 00:00:00 2001 From: begasus Date: Thu, 5 May 2022 12:32:00 +0000 Subject: caffe, fix install path for cmake files diff --git a/cmake/ConfigGen.cmake b/cmake/ConfigGen.cmake index ad91f54..a9cf5e7 100644 --- a/cmake/ConfigGen.cmake +++ b/cmake/ConfigGen.cmake @@ -18,7 +18,7 @@ endfunction() # Usage: # caffe_generate_export_configs() function(caffe_generate_export_configs) - set(install_cmake_suffix "share/Caffe") + set(install_cmake_suffix "${CMAKE_INSTALL_LIBDIR}/cmake/Caffe") if(NOT HAVE_CUDA) set(HAVE_CUDA FALSE) -- 2.35.1