Merge pull request xtensor-stack#133 from JohanMabille/cmake

JohanMabille · web-flow · commit 7d10096e2f9e · 2018-02-01T12:56:30.000+01:00
Cmake
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -23,7 +23,8 @@ install:
   - conda update -q conda
   - conda info -a
   - conda install gtest cmake -c conda-forge
-  - conda install xtensor==0.15.0 pytest numpy pybind11==2.2.1 -c conda-forge
+  - conda install pytest numpy pybind11==2.2.1 -c conda-forge
+  - conda install xtensor==0.15.1 -c QuantStack
   - "set PYTHONHOME=%MINICONDA%"
   - cmake -G "NMake Makefiles" -D CMAKE_INSTALL_PREFIX=%MINICONDA%\\Library -D BUILD_TESTS=ON -D PYTHON_EXECUTABLE=%MINICONDA%\\python.exe .
   - nmake test_xtensor_python
diff --git a/.travis.yml b/.travis.yml
@@ -95,8 +95,9 @@ install:
     - conda update -q conda
     # Useful for debugging any issues with conda
     - conda info -a
-    - conda install xtensor==0.15.0 pytest numpy pybind11==2.2.1 -c conda-forge
+    - conda install pytest numpy pybind11==2.2.1 -c conda-forge
     - conda install cmake gtest -c conda-forge
+    - conda install xtensor==0.15.1 -c QuantStack
     - cmake -D BUILD_TESTS=ON -D CMAKE_INSTALL_PREFIX=$HOME/miniconda .
     - make -j2 test_xtensor_python
     - make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,15 @@ set(XTENSOR_PYTHON_HEADERS
     ${XTENSOR_PYTHON_INCLUDE_DIR}/xtensor-python/xtensor_type_caster_base.hpp
 )
 
+add_library(xtensor-python INTERFACE)
+target_include_directories(xtensor-python INTERFACE $<BUILD_INTERFACE:${XTENSOR_PYTHON_INCLUDE_DIR}>
+                                                    $<BUILD_INTERFACE:${pybind11_INCLUDE_DIRS}>
+                                                    $<BUILD_INTERFACE:${NUMPY_INCLUDE_DIRS}>
+                                                    $<INSTALL_INTERFACE:include>)
+target_link_libraries(xtensor-python INTERFACE xtensor)
+get_target_property(inc_dir xtensor-python INTERFACE_INCLUDE_DIRECTORIES)
+message(STATUS "${inc_dir}")
+
 OPTION(BUILD_TESTS "xtensor test suite" OFF)
 OPTION(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
 
@@ -61,12 +70,6 @@ if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
 endif()
 
 if(BUILD_TESTS)
-    include_directories(${XTENSOR_PYTHON_INCLUDE_DIR})
-    include_directories(${xtl_INCLUDE_DIRS})
-    include_directories(${xtensor_INCLUDE_DIRS})
-    include_directories(${NUMPY_INCLUDE_DIRS})
-    include_directories(${pybind11_INCLUDE_DIRS})
-
     if(MSVC)
         set(PYTHON_MODULE_EXTENSION ".pyd")
     else()
@@ -83,6 +86,13 @@ endif()
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
+install(TARGETS xtensor-python
+        EXPORT ${PROJECT_NAME}-targets)
+
+# Makes the project importable from the build directory
+export(EXPORT ${PROJECT_NAME}-targets
+       FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
+
 install(FILES ${XTENSOR_PYTHON_HEADERS}
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtensor-python)
 
@@ -105,4 +115,7 @@ set(CMAKE_SIZEOF_VOID_P ${_XTENSOR_CMAKE_SIZEOF_VOID_P})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
         DESTINATION ${XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR})
+install(EXPORT ${PROJECT_NAME}-targets
+        FILE ${PROJECT_NAME}Targets.cmake
+        DESTINATION ${XTENSOR_PYTHON_CMAKECONFIG_INSTALL_DIR})
 
diff --git a/include/xtensor-python/pycontainer.hpp b/include/xtensor-python/pycontainer.hpp
@@ -345,7 +345,7 @@ namespace xt
             throw std::runtime_error("Cannot reshape with unknown layout_type.");
         }
 
-        PyArray_Dims dims({reinterpret_cast<npy_intp*>(shape.data()), static_cast<int>(shape.size())});
+        PyArray_Dims dims = {reinterpret_cast<npy_intp*>(shape.data()), static_cast<int>(shape.size())};
         auto new_ptr = PyArray_Newshape((PyArrayObject*) this->ptr(), &dims, npy_layout);
         auto old_ptr = this->ptr();
         this->ptr() = new_ptr;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -78,10 +78,7 @@ endif()
 
 find_package(Threads)
 
-include_directories(${XTENSOR_INCLUDE_DIR})
-include_directories(${XTENSOR_PYTHON_INCLUDE_DIR})
 include_directories(${GTEST_INCLUDE_DIRS})
-include_directories(${PYBIND11_INCLUDE_DIR})
 
 set(XTENSOR_PYTHON_TESTS
     main.cpp
@@ -91,8 +88,8 @@ set(XTENSOR_PYTHON_TESTS
 )
 
 set(XTENSOR_PYTHON_TARGET test_xtensor_python)
-add_executable(${XTENSOR_PYTHON_TARGET} ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS} ${XTENSOR_HEADERS})
-target_link_libraries(${XTENSOR_PYTHON_TARGET} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARIES})
+add_executable(${XTENSOR_PYTHON_TARGET} ${XTENSOR_PYTHON_TESTS} ${XTENSOR_PYTHON_HEADERS})
+target_link_libraries(${XTENSOR_PYTHON_TARGET} xtensor-python ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARIES})
 
 if(DOWNLOAD_GTEST OR GTEST_SRC_DIR)
     add_dependencies(${XTENSOR_PYTHON_TARGET} gtest_main)

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ namespace xt`
`345`	`345`	`throw std::runtime_error("Cannot reshape with unknown layout_type.");`
`346`	`346`	`}`
`347`	`347`
`348`		`- PyArray_Dims dims({reinterpret_cast<npy_intp*>(shape.data()), static_cast<int>(shape.size())});`
	`348`	`+ PyArray_Dims dims = {reinterpret_cast<npy_intp*>(shape.data()), static_cast<int>(shape.size())};`
`349`	`349`	`auto new_ptr = PyArray_Newshape((PyArrayObject*) this->ptr(), &dims, npy_layout);`
`350`	`350`	`auto old_ptr = this->ptr();`
`351`	`351`	`this->ptr() = new_ptr;`