Skip to content

Commit 84f1078

Browse files
committed
use pybind11 find package instead
1 parent 4e8ecd2 commit 84f1078

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

CMakeLists.txt

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,61 +4,64 @@ project(compas_libigl)
44
set(CMAKE_CXX_STANDARD 11)
55
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
66

7-
#Eigen
8-
if (WIN32)
7+
# Eigen
8+
if(WIN32)
99
set(EIGEN3_INCLUDE_DIR "$ENV{CONDA_PREFIX}/Library/include/eigen3")
10-
else ()
10+
else()
1111
set(EIGEN3_INCLUDE_DIR "$ENV{CONDA_PREFIX}/include/eigen3")
12-
endif ()
12+
endif()
1313

14-
#Boost
15-
if (WIN32)
14+
# Boost
15+
if(WIN32)
1616
set(BOOST_ROOT "$ENV{CONDA_PREFIX}/Library/include")
17-
else ()
17+
else()
1818
set(BOOST_ROOT "$ENV{CONDA_PREFIX}/include")
19-
endif ()
19+
endif()
2020

21-
#Pybind11
21+
# Pybind11
2222
set(PYBIND11_CPP_STANDARD -std=c++11)
23-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/pybind11)
2423

25-
#Libigl
24+
# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/pybind11)
25+
# add_subdirectory($ENV{CONDA_PREFIX})
26+
find_package(pybind11 CONFIG REQUIRED)
27+
28+
# Libigl
2629
option(LIBIGL_WITH_TRIANGLE "Use Triangle" OFF)
2730
option(LIBIGL_WITH_CGAL "Use CGAL" OFF)
2831
find_package(LIBIGL REQUIRED)
2932

30-
#geodistance
33+
# geodistance
3134
pybind11_add_module(compas_libigl_geodistance MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/geodistance/geodistance.cpp)
3235
target_link_libraries(compas_libigl_geodistance PRIVATE igl::core)
3336

34-
#isolines
37+
# isolines
3538
pybind11_add_module(compas_libigl_isolines MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/isolines/isolines.cpp)
3639
target_link_libraries(compas_libigl_isolines PRIVATE igl::core)
3740

38-
#planarize
41+
# planarize
3942
pybind11_add_module(compas_libigl_planarize MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/planarize/planarize.cpp)
4043
target_link_libraries(compas_libigl_planarize PRIVATE igl::core)
4144

42-
#massmatrix
45+
# massmatrix
4346
pybind11_add_module(compas_libigl_massmatrix MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/massmatrix/massmatrix.cpp)
4447
target_link_libraries(compas_libigl_massmatrix PRIVATE igl::core)
4548

46-
#curvature
49+
# curvature
4750
pybind11_add_module(compas_libigl_curvature MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/curvature/curvature.cpp)
4851
target_link_libraries(compas_libigl_curvature PRIVATE igl::core)
4952

50-
#intersections
53+
# intersections
5154
pybind11_add_module(compas_libigl_intersections MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/intersections/intersections.cpp)
5255
target_link_libraries(compas_libigl_intersections PRIVATE igl::core)
5356

54-
#boundaries
57+
# boundaries
5558
pybind11_add_module(compas_libigl_boundaries MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/boundaries/boundaries.cpp)
5659
target_link_libraries(compas_libigl_boundaries PRIVATE igl::core)
5760

58-
#parametrisations
61+
# parametrisations
5962
pybind11_add_module(compas_libigl_parametrisation MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/parametrisation/parametrisation.cpp)
6063
target_link_libraries(compas_libigl_parametrisation PRIVATE igl::core)
6164

62-
#meshing
65+
# meshing
6366
pybind11_add_module(compas_libigl_meshing MODULE ${CMAKE_CURRENT_SOURCE_DIR}/src/compas_libigl/meshing/meshing.cpp)
6467
target_link_libraries(compas_libigl_meshing PRIVATE igl::core)

0 commit comments

Comments
 (0)