Skip to content

Commit 6fa716c

Browse files
committed
Merge branch 'master' of https://github.com/dilawar/moose-core into devel
2 parents 4dc5c3e + 2b4bd1d commit 6fa716c

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

.github/workflows/dockerimage.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Docker Image build wheels
2+
3+
on: [push]
4+
5+
jobs:
6+
7+
build:
8+
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v2
13+
- name: Build Wheels Using docker images
14+
run: docker build . --file .docker/wheel/Dockerfile --tag bhallalab/moose-wheels:$(date +%s)

setup.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def run(self):
7777
class build_ext(_build_ext):
7878
user_options = [('with-boost', None, 'Use Boost Libraries (OFF)')
7979
, ('with-gsl', None, 'Use Gnu Scienfific Library (ON)')
80+
, ('with-gsl-static', None, 'Use GNU Scientific Library (static library) (OFF)')
8081
, ('debug', None, 'Build moose in debugging mode (OFF)')
8182
, ('no-build', None, 'DO NOT BUILD. (for debugging/development)')
8283
] + _build_ext.user_options
@@ -85,6 +86,7 @@ def initialize_options(self):
8586
# Initialize options.
8687
self.with_boost = 0
8788
self.with_gsl = 1
89+
self.with_gsl_static = 0
8890
self.debug = 0
8991
self.no_build = 0
9092
self.cmake_options = {}
@@ -99,6 +101,9 @@ def finalize_options(self):
99101
if self.with_boost:
100102
self.cmake_options['WITH_BOOST'] = 'ON'
101103
self.cmake_options['WITH_GSL'] = 'OFF'
104+
else:
105+
if self.with_gsl_static:
106+
self.cmake_options['GSL_USE_STATIC_LIBRARIES'] = 'ON'
102107
if self.debug:
103108
self.cmake_options['CMAKE_BUILD_TYPE'] = 'Debug'
104109
else:

0 commit comments

Comments
 (0)