1 files changed, 32 insertions, 12 deletions
diff --git a/sources/shiboken2/libshiboken/CMakeLists.txt b/sources/shiboken2/libshiboken/CMakeLists.txt
index 6d2d1c88f..06d6330f5 100644
--- a/sources/shiboken2/libshiboken/CMakeLists.txt
+++ b/sources/shiboken2/libshiboken/CMakeLists.txt
@@ -1,5 +1,22 @@
 project(libshiboken)
 
+macro(get_numpy_location)
+    execute_process(
+      COMMAND ${PYTHON_EXECUTABLE} -c "if True:
+      import sys
+      import os
+      numpy = ''
+      for p in sys.path:
+          if 'site-' in p:
+              numpy = os.path.join(p, 'numpy')
+              if os.path.exists(numpy):
+                  print(os.path.realpath(numpy))
+                  break"
+      OUTPUT_VARIABLE PYTHON_NUMPY_LOCATION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  message("PYTHON_NUMPY_LOCATION: " ${PYTHON_NUMPY_LOCATION})
+endmacro()
+
 option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
 if(ENABLE_VERSION_SUFFIX)
     set(shiboken2_SUFFIX "-${shiboken_MAJOR_VERSION}.${shiboken_MINOR_VERSION}")
@@ -10,14 +27,6 @@ endif()
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sbkversion.h.in"
                "${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h" @ONLY)
 
-#Find installed sparsehash
-find_path(SPARSEHASH_INCLUDE_PATH sparseconfig.h PATH_SUFFIXES "/google/sparsehash")
-if(SPARSEHASH_INCLUDE_PATH)
-    message(STATUS "Using system hash found in: ${SPARSEHASH_INCLUDE_PATH}")
-else()
-    set(SPARSEHASH_INCLUDE_PATH ${CMAKE_SOURCE_DIR}/ext/sparsehash)
-endif()
-
 set(libshiboken_MAJOR_VERSION ${shiboken_MAJOR_VERSION})
 set(libshiboken_MINOR_VERSION ${shiboken_MINOR_VERSION})
 set(libshiboken_MICRO_VERSION ${shiboken_MICRO_VERSION})
@@ -29,6 +38,7 @@ basewrapper.cpp
 debugfreehook.cpp
 gilstate.cpp
 helper.cpp
+sbkarrayconverter.cpp
 sbkconverter.cpp
 sbkenum.cpp
 sbkmodule.cpp
@@ -39,10 +49,19 @@ typeresolver.cpp
 shibokenbuffer.cpp
 )
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}
-                    ${SBK_PYTHON_INCLUDE_DIR}
-                    ${SPARSEHASH_INCLUDE_PATH})
+get_numpy_location()
+
+set(libshiboken_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${SBK_PYTHON_INCLUDE_DIR})
+
+if (NOT "${PYTHON_NUMPY_LOCATION}" STREQUAL "")
+    set(libshiboken_INCLUDES ${libshiboken_INCLUDES} ${PYTHON_NUMPY_LOCATION}/core/include)
+    set(libshiboken_SRC ${libshiboken_SRC} sbknumpyarrayconverter.cpp)
+    add_definitions(-DHAVE_NUMPY -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION)
+endif()
+
+set(APIEXTRACTOR_EXTRA_INCLUDES ${APIEXTRACTOR_EXTRA_INCLUDES} ${LIBXSLT_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+
+include_directories(${libshiboken_INCLUDES})
 add_library(libshiboken SHARED ${libshiboken_SRC})
 target_link_libraries(libshiboken ${SBK_PYTHON_LIBRARIES})
 set_target_properties(libshiboken PROPERTIES OUTPUT_NAME "shiboken2${shiboken2_SUFFIX}${PYTHON_SHARED_LIBRARY_SUFFIX}"
@@ -57,6 +76,7 @@ install(FILES
         conversions.h
         gilstate.h
         helper.h
+        sbkarrayconverter.h
         sbkconverter.h
         sbkenum.h
         sbkmodule.h