Skip to content

Commit

Permalink
build: Allow building with PySide6 with the USE_PYSIDE6 environment v…
Browse files Browse the repository at this point in the history
…ariable

Issue the command e.g. USE_PYSIDE=6 make install to skip the PyQt prereq folder
and install PySide6 (commented out in app_requirements.txt) instead.
  • Loading branch information
zjp committed Jan 6, 2025
1 parent 49e7529 commit 7baf91d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
6 changes: 5 additions & 1 deletion prereqs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@ endif
.NOTPARALLEL:

# keep in alphabetical order, dependencies go below
SUBDIRS += ambertools pips PyQt Python

SUBDIRS += ambertools pips
ifndef USE_PYSIDE6
SUBDIRS += PyQt
endif
SUBDIRS += Python

# All needed subdirectories must be set by now.
include $(TOP)/mk/subdir.make
Expand Down
4 changes: 4 additions & 0 deletions prereqs/pips/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ app-install: $(PLATO_WHEELS)
# Install numpy first so that PyOpenGL_Accelerate will compile numpy_formathandler
$(APP_PIP_INSTALL) $(shell grep numpy app_requirements.txt)
CFLAGS+=$(WHEEL_CFLAGS) $(APP_PIP_INSTALL) --no-build-isolation -r app_requirements.txt
ifdef USE_PYSIDE6
$(APP_PIP_INSTALL) $(shell grep PySide6 app_requirements.txt | sed -e 's/#//')
$(APP_PIP_INSTALL) $(shell grep shiboken6 app_requirements.txt | sed -e 's/#//')
endif
ifneq (,$(SOURCE_WHEELS))
LANG=$(LANG) $(PIP_INSTALL) --no-build-isolation --no-binary $(subst $(SPACE),$(COMMA),$(SOURCE_WHEELS)) $(SOURCE_VERSIONS)
endif
Expand Down
3 changes: 2 additions & 1 deletion prereqs/pips/app_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ PyOpenGL-accelerate==3.1.7
python-dateutil==2.9.0.post0
# PyQt handled in prereqs/PyQt
# sip handled in prereqs/PyQt
#PySide2==5.15.2
#PySide6==6.8.1.1
#shiboken6==6.8.1.1
qtconsole==5.5.2
requests==2.32.3
scipy==1.14.0
Expand Down

0 comments on commit 7baf91d

Please sign in to comment.