Skip to content

Commit

Permalink
Doh! The manylinux.sh script was cloning DIPlib master branch, so non…
Browse files Browse the repository at this point in the history
…e of what I was doing in this branch mattered...
  • Loading branch information
crisluengo committed Jun 18, 2024
1 parent e2d8254 commit e2294a1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ if(DEFINED PYTHON_EXECUTABLE AND NOT DEFINED Python_EXECUTABLE)
endif()
find_package(Python 3.6 COMPONENTS Interpreter Development.Module)
if(Python_Development.Module_FOUND)
message("Python_EXECUTABLE = ${Python_EXECUTABLE}")
message("Python_INCLUDE_DIRS = ${Python_INCLUDE_DIRS}")
message("Python_LINK_OPTIONS = ${Python_LINK_OPTIONS}")
message("Python_LIBRARIES = ${Python_LIBRARIES}")
message("Python_LIBRARY_DIRS = ${Python_LIBRARY_DIRS}")
message("Python_RUNTIME_LIBRARY_DIRS = ${Python_RUNTIME_LIBRARY_DIRS}")
message("Python_VERSION = ${Python_VERSION}")
message(STATUS "Python_EXECUTABLE = ${Python_EXECUTABLE}")
message(STATUS "Python_INCLUDE_DIRS = ${Python_INCLUDE_DIRS}")
message(STATUS "Python_LINK_OPTIONS = ${Python_LINK_OPTIONS}")
message(STATUS "Python_LIBRARIES = ${Python_LIBRARIES}")
message(STATUS "Python_LIBRARY_DIRS = ${Python_LIBRARY_DIRS}")
message(STATUS "Python_RUNTIME_LIBRARY_DIRS = ${Python_RUNTIME_LIBRARY_DIRS}")
message(STATUS "Python_VERSION = ${Python_VERSION}")
set(DIP_BUILD_PYDIP ON CACHE BOOL "Build the PyDIP Python module")
endif()

Expand Down
5 changes: 2 additions & 3 deletions tools/build/manylinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ BUILD_THREADS=4
PYTHON_VERSIONS=(3.9 3.10 3.11 3.12)
EXCLUDES=(libjvm.so libOpenGL.so.0 libGLX.so.0 libGLdispatch.so.0)

# Clone diplib repository
git clone https://github.com/diplib/diplib
cd diplib
# Current directory is diplib repo
pwd
mkdir build
cd build

Expand Down

0 comments on commit e2294a1

Please sign in to comment.