Skip to content

Commit

Permalink
Update build scripts for conda recipe
Browse files Browse the repository at this point in the history
Remove make QM command which no longer exists
Do not recompile extension modules during install
  • Loading branch information
mliu49 committed May 15, 2018
1 parent 06ec1ca commit c5590b9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions bld.bat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

:: Compile RMG
mingw32-make -j%CPU_COUNT%
mingw32-make QM

:: Install RMG
%PYTHON% setup.py install

:: lazy "install" of everything in our 'external' folder.
Expand Down
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Compile RMG
make -j${CPU_COUNT}
make QM

# Install RMG
$PYTHON setup.py install

# lazy "install" of everything in our 'external' folder.
Expand Down
4 changes: 0 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,6 @@ def getCanthermExtensionModules():
################################################################################

ext_modules = []
if 'install' in sys.argv:
# This is so users can still do simply `python setup.py install`
ext_modules.extend(getMainExtensionModules())
ext_modules.extend(getSolverExtensionModules())
if 'main' in sys.argv:
# This is for `python setup.py build_ext main`
sys.argv.remove('main')
Expand Down

0 comments on commit c5590b9

Please sign in to comment.