Skip to content

Commit 6deb9cd

Browse files
committed
use conda to get sources
1 parent b99e718 commit 6deb9cd

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ else ()
2020
endif ()
2121

2222
#Eigen
23-
set(EIGEN3_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/eigen")
23+
# set(EIGEN3_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/eigen")
24+
if (WIN32)
25+
set(EIGEN3_INCLUDE_DIR "${PYTHON_DIR}/Library/include/eigen3")
26+
else ()
27+
set(EIGEN3_INCLUDE_DIR "${PYTHON_DIR}/include/eigen3")
28+
endif ()
2429

2530
#Boost
2631
if (WIN32)
@@ -31,7 +36,7 @@ endif ()
3136

3237
#Pybind11
3338
set(PYBIND11_CPP_STANDARD -std=c++11)
34-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/pybind11)
39+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pybind11)
3540

3641
#Libigl
3742
option(LIBIGL_WITH_TRIANGLE "Use Triangle" ON)

cmake/FindLIBIGL.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ find_path(LIBIGL_INCLUDE_DIR igl/readOBJ.h
2020
${CMAKE_SOURCE_DIR}/libigl
2121
${CMAKE_SOURCE_DIR}/../libigl
2222
${CMAKE_SOURCE_DIR}/../../libigl
23-
${CMAKE_SOURCE_DIR}/ext/libigl
24-
${CMAKE_SOURCE_DIR}/../ext/libigl
23+
${CMAKE_SOURCE_DIR}/ext/libigl
24+
${CMAKE_SOURCE_DIR}/thirdparty/libigl
25+
${CMAKE_SOURCE_DIR}/../ext/libigl
2526
/usr
2627
/usr/local
2728
/usr/local/igl/libigl
@@ -35,4 +36,4 @@ find_package_handle_standard_args(LIBIGL
3536
mark_as_advanced(LIBIGL_INCLUDE_DIR)
3637

3738
list(APPEND CMAKE_MODULE_PATH "${LIBIGL_INCLUDE_DIR}/../cmake")
38-
include(libigl)
39+
include(libigl)

recipe/meta.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,19 @@ package:
66
version: {{ version }}
77

88
source:
9-
# git_url: https://github.com/BlockResearchGroup/compas_libigl.git
10-
# git_depth: 1
11-
# url: https://github.com/blockresearchgroup/compas_libigl/archive/alpha-{{ version }}.tar.gz
12-
# sha256: f90b39d88ea003bc2ca7925146babb20320cedebe096e4c276835490be8e10a0
13-
# git_url: ../
14-
path: $RECIPE_DIR/../../
9+
- url: https://github.com/pybind/pybind11/archive/v2.5.0.tar.gz
10+
folder: $RECIPE_DIR/../thirdparty/pybind11
11+
fn: pybind11-2.5.0.tar.gz
12+
sha256: 97504db65640570f32d3fdf701c25a340c8643037c3b69aec469c10c93dc8504
13+
- url: https://github.com/libigl/libigl/archive/v2.2.0.tar.gz
14+
folder: $RECIPE_DIR/../thirdparty/libigl
15+
fn: libigl-2.2.0.tar.gz
16+
sha256: b336e548d718536956e2d6958a0624bc76d50be99039454072ecdc5cf1b2ede5
17+
- path: $RECIPE_DIR/../../
18+
19+
# - url: https://github.com/blockresearchgroup/compas_libigl/archive/v0.1.0.tar.gz
20+
# fn: compas_libigl-0.1.0.tar.gz
21+
# sha256: b336e548d718536956e2d6958a0624bc76d50be99039454072ecdc5cf1b2ede5
1522

1623
build:
1724
number: 0
@@ -23,6 +30,7 @@ requirements:
2330
- git
2431
- cmake
2532
- boost
33+
- eigen
2634
host:
2735
- python
2836
- pip

recipe/sha256.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import os
22
import hashlib
33

4-
HERE = os.path.dirname(__file__)
5-
FILE = os.path.join(HERE, '../temp/compas_libigl-alpha-0.1.0.tar.gz')
4+
# HERE = os.path.dirname(__file__)
5+
# FILE = os.path.join(HERE, '/Users/vanmelet/Downloads/pybind11-2.5.0.tar.gz')
6+
# FILE = '/Users/vanmelet/Downloads/pybind11-2.5.0.tar.gz'
7+
FILE = '/Users/vanmelet/Downloads/libigl-2.2.0.tar.gz'
68

79
with open(FILE, 'rb') as f:
810
data = f.read()

0 commit comments

Comments
 (0)