Skip to content

Commit 3898410

Browse files
committed
prep for local builds
1 parent 4c2e7c4 commit 3898410

File tree

3 files changed

+23
-20
lines changed

3 files changed

+23
-20
lines changed

recipe/meta.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% set name = "compas_libigl" %}
2-
{% set version = "0.1.2" %}
3-
{% set hash = "e411b45e1023a7826c571ecd63a619722631f4a8cdf0445b04a77c6e6147f826" %}
2+
{% set version = "0.1.3" %}
3+
{% set hash = "8d0faf8fec607a160854a74b89fd13a737255d377c87bc8686ccde2131d2c094" %}
44
{% set pybind11_version = "2.5.0" %}
55
{% set pybind11_hash = "97504db65640570f32d3fdf701c25a340c8643037c3b69aec469c10c93dc8504" %}
66
{% set libigl_version = "2.2.0" %}
@@ -25,22 +25,28 @@ source:
2525

2626
build:
2727
number: 0
28+
skip: true # [py<36]
2829
script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv"
29-
missing_dso_whitelist:
30-
- libSystem.B.dylib
3130

3231
requirements:
3332
build:
3433
- {{ compiler('c') }}
3534
- {{ compiler('cxx') }}
3635
- git
3736
- cmake
37+
- make
38+
- dlib
3839
host:
3940
- python
4041
- pip
4142
- boost
4243
- eigen
44+
- gmp 6.1.2 # [not win]
45+
- gmp 5.0* # [win]
46+
- mpfr 4.0.1 # [not win]
47+
- mpfr 3.0* # [win]
4348
run:
49+
- python
4450
- COMPAS >=0.15.5
4551

4652
test:
@@ -49,12 +55,11 @@ test:
4955

5056
about:
5157
home: https://github.com/blockresearchgroup/compas_libigl
52-
license: MPL2
58+
license: MPL-2.0
5359
license_file: LICENSE.MPL2
5460
summary: 'COMPAS friendly wrappers for libigl functions.'
5561
dev_url: https://github.com/blockresearchgroup/compas_libigl
56-
doc_url: https://blockresearchgroup.github.io/compas_libigl
57-
doc_source_url: https://github.com/blockresearchgroup/compas_libigl/blob/master/README.rst
62+
doc_url: https://github.com/blockresearchgroup/compas_libigl
5863

5964
extra:
6065
recipe-maintainers:

recipe/sha256.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# FILE = os.path.join(HERE, '/Users/vanmelet/Downloads/pybind11-2.5.0.tar.gz')
66
# FILE = '/Users/vanmelet/Downloads/pybind11-2.5.0.tar.gz'
77
# FILE = '/Users/vanmelet/Downloads/libigl-2.2.0.tar.gz'
8-
FILE = '/Users/vanmelet/Downloads/compas_libigl-0.1.2.tar.gz'
8+
FILE = '/Users/vanmelet/Downloads/compas_libigl-0.1.3.tar.gz'
99

1010
with open(FILE, 'rb') as f:
1111
data = f.read()

setup.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,7 @@ def build_extension(self, ext):
4949
extdir = os.path.abspath(os.path.dirname(self.get_ext_fullpath(ext.name)))
5050
cmake_args = [
5151
'-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
52-
'-DPYTHON_EXECUTABLE=' + sys.executable,
53-
# For MacOS.
54-
# During compiling stage, the python module always links to a temporary generated library which is going to be destroyed.
55-
# Then importing the final installed module will return a link error
56-
# The following commands will force the module to look up the its dynmaic linked library in the same folder
57-
'-DCMAKE_INSTALL_RPATH=@loader_path',
58-
'-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
59-
'-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF'
60-
]
61-
52+
'-DPYTHON_EXECUTABLE=' + sys.executable]
6253

6354
cfg = 'Debug' if self.debug else 'Release'
6455
build_args = ['--config', cfg]
@@ -69,11 +60,18 @@ def build_extension(self, ext):
6960
cmake_args += ['-A', 'x64']
7061
build_args += ['--', '/m']
7162
else:
63+
# # For MacOS.
64+
# # During compiling stage, the python module always links to a temporary generated library which is going to be destroyed.
65+
# # Then importing the final installed module will return a link error
66+
# # The following commands will force the module to look up the its dynmaic linked library in the same folder
67+
# cmake_args += [
68+
# '-DCMAKE_INSTALL_RPATH=@loader_path',
69+
# '-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON',
70+
# '-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF']
71+
7272
cmake_args += ['-DCMAKE_BUILD_TYPE=' + cfg]
7373
build_args += ['--', '-j2']
7474

75-
print(self.build_temp)
76-
7775
env = os.environ.copy()
7876
env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''), self.distribution.get_version())
7977
if not os.path.exists(self.build_temp):

0 commit comments

Comments
 (0)