From c80da2902fd01add9f4e769b5368d55c2df9fb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Dumas?= Date: Sun, 14 Oct 2018 21:36:41 -0400 Subject: [PATCH] Update cmake. --- .gitignore | 1 + cmake/LibiglDownloadExternal.cmake | 2 +- python/CMakeLists.txt | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4a8e9eae7..8044c4cf0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ external/mpfr external/boost external/.cache external/build +external/pybind11 .DS_Store libigl.zip *tags diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index 56082ce9b..e03d9fef3 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -17,7 +17,7 @@ endfunction() ## CGAL function(igl_download_cgal) igl_download_project(cgal - GIT_REPOSITORY https://github.com/libigl/cgal.git + GIT_REPOSITORY https://github.com/CGAL/cgal.git GIT_TAG f7c3c8212b56c0d6dae63787efc99093f4383415 ) endfunction() diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 6729ba29a..bf4dbb3cd 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -23,10 +23,6 @@ if(UNIX) endif() endif() -## include pybind -set(PYBIND11_DIR ${PROJECT_SOURCE_DIR}/../external/pybind11 CACHE PATH "Path to pybind11") -add_subdirectory(${PYBIND11_DIR} pybind11) - ## include libigl option(LIBIGL_USE_STATIC_LIBRARY "Use LibIGL as static library" OFF) option(LIBIGL_WITH_OPENGL "Use viewer" ON) @@ -52,6 +48,10 @@ if(NOT TARGET igl::core) include(libigl) endif() +## include pybind +set(PYBIND11_DIR ${PROJECT_SOURCE_DIR}/../external/pybind11 CACHE PATH "Path to pybind11") +add_subdirectory(${PYBIND11_DIR} pybind11) + ## Prepare the python library pybind11_add_module(pyigl python_shared.cpp