Merge pull request #561 from madsbk/bohrium_api_on_osx

BohriumAPI on MacOSX
bh107 · Nov 23, 2018 · 93877e7 · 93877e7
2 parents 5bf2f13 + 4177648
commit 93877e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,6 +122,9 @@ find_package(OpenCV 3)
 set_package_properties(OpenCV PROPERTIES DESCRIPTION "Open Source Computer Vision" URL "opencv.org")
 set_package_properties(OpenCV PROPERTIES TYPE RECOMMENDED PURPOSE "Enables the OpenCV extended method")
 
+# We do not want MacOSX to set "@path" when installing because of the MacOSX wheel tool `delocate`.
+# Instead, we set the installation path manually.
+set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIBDIR})
 
 #####################
 # Bohrium components

diff --git a/bridge/npbackend/bohrium/nobh/bincount_cython.pyx b/bridge/npbackend/bohrium/nobh/bincount_cython.pyx
@@ -12,10 +12,6 @@ cimport numpy as cnp
 ctypedef cnp.uint64_t uint64
 ctypedef cnp.int64_t int64
 
-IF UNAME_SYSNAME == "Linux":
-    cimport openmp
-
-
 @cython.boundscheck(False) # turn off bounds-checking
 @cython.cdivision(True) # turn off division-by-zero checking
 cdef _count(uint64[:] x, uint64[:] out):