diff --git a/pysap/info.py b/pysap/info.py index c6a51650..5eac6818 100644 --- a/pysap/info.py +++ b/pysap/info.py @@ -75,12 +75,12 @@ "pyqtgraph>=0.10.0", "progressbar2>=3.34.3", "modopt>=1.4.0", - "scikit-learn>=0.19.1", "PyWavelets>=1.0.0" ] PREINSTALL_REQUIRES = [ "pybind11>=2.3.0", "pyqt5>=5.12.2" + "scikit-learn>=0.19.1", ] EXTRA_REQUIRES = { "gui": { diff --git a/sparse2d/python/CMakeLists.txt b/sparse2d/python/CMakeLists.txt index 117e64fd..e1b02cfd 100644 --- a/sparse2d/python/CMakeLists.txt +++ b/sparse2d/python/CMakeLists.txt @@ -48,6 +48,8 @@ project(pysparse) # Custom modules include(BuildCfitsIO) + get_filename_component(SPARSE2D_INSTALL_DIR ${PYTHON_EXECUTABLE} DIRECTORY) + message(STATUS "Binary output path : ${SPARSE2D_INSTALL_DIR}") include(BuildSparse2D) # Includes diff --git a/sparse2d/python/cmake/Modules/BuildSparse2D.cmake b/sparse2d/python/cmake/Modules/BuildSparse2D.cmake index 93c03dc9..c69750d8 100644 --- a/sparse2d/python/cmake/Modules/BuildSparse2D.cmake +++ b/sparse2d/python/cmake/Modules/BuildSparse2D.cmake @@ -11,17 +11,16 @@ ExternalProject_Add(sparse2d # GIT_TAG master DEPENDS cfitsio CONFIGURE_COMMAND cmake ../sparse2d - -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/extern + -DCMAKE_INSTALL_PREFIX=${SPARSE2D_INSTALL_DIR}/.. -DCFITSIO_INCLUDE_DIRS=${cfitsio_INCLUDE_DIR} -DCFITSIO_LIBRARY_DIRS=${cfitsio_LIBRARY_DIR} -DCFITSIO_LIBRARIES=${cfitsio_LIBRARIES} -DCMAKE_BUILD_TYPE=RELEASE BUILD_COMMAND make install -j8 - INSTALL_COMMAND "" BUILD_IN_SOURCE 0 ) -set(sparse2d_LIBRARY_DIR ${CMAKE_BINARY_DIR}/extern/lib/ ) -set(sparse2d_INCLUDE_DIR ${CMAKE_BINARY_DIR}/extern/include/ ) +set(sparse2d_LIBRARY_DIR ${SPARSE2D_INSTALL_DIR}/../lib/ ) +set(sparse2d_INCLUDE_DIR ${SPARSE2D_INSTALL_DIR}/../include/ ) set(sparse2d_LIBRARIES -lmga2d -lsparse3d -lsparse2d -lsparse1d -ltools)