pkgs/applications/science/math/caffe/darwin.patch

   1 diff --git a/Makefile b/Makefile
   2 index c823f66e..65b90c5e 100644
   3 --- a/Makefile
   4 +++ b/Makefile
   5 @@ -32,9 +32,9 @@ SRC_DIRS := $(shell find * -type d -exec bash -c "find {} -maxdepth 1 \
   6  LIBRARY_NAME := $(PROJECT)
   7  LIB_BUILD_DIR := $(BUILD_DIR)/lib
   8  STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a
   9 -DYNAMIC_VERSION_MAJOR          := 1
  10 -DYNAMIC_VERSION_MINOR          := 0
  11 -DYNAMIC_VERSION_REVISION       := 0
  12 +DYNAMIC_VERSION_MAJOR          := 1
  13 +DYNAMIC_VERSION_MINOR          := 0
  14 +DYNAMIC_VERSION_REVISION       := 0
  15  DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so
  16  #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)
  17  DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)
  18 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
  19 index c48255c8..cf4c580e 100644
  20 --- a/cmake/Dependencies.cmake
  21 +++ b/cmake/Dependencies.cmake
  22 @@ -105,7 +105,6 @@ if(USE_OPENCV)
  23  endif()
  24
  25  # ---[ BLAS
  26 -if(NOT APPLE)
  27    set(BLAS "Atlas" CACHE STRING "Selected BLAS library")
  28    set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL")
  29
  30 @@ -123,17 +122,6 @@ if(NOT APPLE)
  31      list(APPEND Caffe_LINKER_LIBS PUBLIC ${MKL_LIBRARIES})
  32      list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_MKL)
  33    endif()
  34 -elseif(APPLE)
  35 -  find_package(vecLib REQUIRED)
  36 -  list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${vecLib_INCLUDE_DIR})
  37 -  list(APPEND Caffe_LINKER_LIBS PUBLIC ${vecLib_LINKER_LIBS})
  38 -
  39 -  if(VECLIB_FOUND)
  40 -    if(NOT vecLib_INCLUDE_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*")
  41 -      list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_ACCELERATE)
  42 -    endif()
  43 -  endif()
  44 -endif()
  45
  46  # ---[ Python
  47  if(BUILD_python)