From 33d546899deb8c32853c74f1f01563be4688e6b1 Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Mon, 12 Nov 2018 15:06:46 +0100 Subject: [PATCH 1/6] Add EIGEN_ROOT argument in CMakeList --- .gitignore | 1 + cmake/LibiglDownloadExternal.cmake | 2 +- cmake/libigl.cmake | 17 ++++++----------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index bdf7976b5..818ffdc99 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ .vs/ .vscode/ /external +!/external/CoMISo Debug/ README.html Release/ diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index f7c69305c..b28b9a5be 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -34,7 +34,7 @@ endfunction() ## CoMISo function(igl_download_comiso) igl_download_project(CoMISo - GIT_REPOSITORY https://github.com/libigl/CoMISo.git + GIT_REPOSITORY https://github.com/libigl/CoMISo.git GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa ) endfunction() diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake index 4b11007a0..4f2b3ec8a 100644 --- a/cmake/libigl.cmake +++ b/cmake/libigl.cmake @@ -36,6 +36,8 @@ option(LIBIGL_WITH_XML "Use XML" OFF) option(LIBIGL_WITH_PYTHON "Use Python" OFF) option(LIBIGL_WITHOUT_COPYLEFT "Disable Copyleft libraries" OFF) +set(EIGEN_ROOT "Default" CACHE FILEPATH "Path to Eigen library") + ################################################################################ ### Configuration @@ -93,16 +95,10 @@ if(UNIX) endif() # Eigen -if(TARGET Eigen3::Eigen) - # If an imported target already exists, use it - target_link_libraries(igl_common INTERFACE Eigen3::Eigen) -else() - igl_download_eigen() - target_include_directories(igl_common SYSTEM INTERFACE - $ - $ - ) -endif() +target_include_directories(igl_common SYSTEM INTERFACE + $ + $ +) # C++11 Thread library find_package(Threads REQUIRED) @@ -237,7 +233,6 @@ endfunction() if(LIBIGL_WITH_COMISO) compile_igl_module("comiso") if(NOT TARGET CoMISo) - igl_download_comiso() add_subdirectory("${LIBIGL_EXTERNAL}/CoMISo" CoMISo) endif() target_link_libraries(igl_comiso ${IGL_SCOPE} CoMISo) From 2faad2f8e8ef3b352fb90bb9450dd23b1328f19a Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Tue, 13 Nov 2018 14:20:07 +0100 Subject: [PATCH 2/6] Remove eigen download function from cmake --- cmake/LibiglDownloadExternal.cmake | 10 +--------- cmake/libigl.cmake | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index b28b9a5be..a893285e0 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -35,7 +35,7 @@ endfunction() function(igl_download_comiso) igl_download_project(CoMISo GIT_REPOSITORY https://github.com/libigl/CoMISo.git - GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa + GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa ) endfunction() @@ -47,14 +47,6 @@ function(igl_download_cork) ) endfunction() -## Eigen -function(igl_download_eigen) - igl_download_project(eigen - URL http://bitbucket.org/eigen/eigen/get/3.2.10.tar.gz - URL_MD5 8ad10ac703a78143a4062c9bda9d8fd3 - ) -endfunction() - ## Embree function(igl_download_embree) igl_download_project(embree diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake index 4f2b3ec8a..6224c7cca 100644 --- a/cmake/libigl.cmake +++ b/cmake/libigl.cmake @@ -233,6 +233,7 @@ endfunction() if(LIBIGL_WITH_COMISO) compile_igl_module("comiso") if(NOT TARGET CoMISo) + igl_download_comiso() add_subdirectory("${LIBIGL_EXTERNAL}/CoMISo" CoMISo) endif() target_link_libraries(igl_comiso ${IGL_SCOPE} CoMISo) From 53abe0a00e072bdd3e71ff653a119b9f0ae00d35 Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Tue, 13 Nov 2018 14:41:37 +0100 Subject: [PATCH 3/6] Clean .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 818ffdc99..bdf7976b5 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ .vs/ .vscode/ /external -!/external/CoMISo Debug/ README.html Release/ From d9b8f6fb949add3f8dd8cb16dd39814ad13ecfe4 Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Tue, 13 Nov 2018 14:43:50 +0100 Subject: [PATCH 4/6] Clean LibiglDownloadExternal.cmake --- cmake/LibiglDownloadExternal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index a893285e0..a60e4dda4 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -34,8 +34,8 @@ endfunction() ## CoMISo function(igl_download_comiso) igl_download_project(CoMISo - GIT_REPOSITORY https://github.com/libigl/CoMISo.git - GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa + GIT_REPOSITORY https://github.com/libigl/CoMISo.git + GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa ) endfunction() From 2d1ff3e4df2ccf56fdeefc71ff70d6364c6d9163 Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Tue, 13 Nov 2018 15:09:40 +0100 Subject: [PATCH 5/6] Add CoMISo download from anatoscope repo in CMakeList --- cmake/LibiglDownloadExternal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index a60e4dda4..4582751f1 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -34,8 +34,8 @@ endfunction() ## CoMISo function(igl_download_comiso) igl_download_project(CoMISo - GIT_REPOSITORY https://github.com/libigl/CoMISo.git - GIT_TAG fea3ee0ba7d42ee3eca202d484e4fad855e4d6aa + GIT_REPOSITORY https://github.com/Anatoscope/CoMISo.git + GIT_TAG 2014196618d072ce7c9dbf6bd56f64f37829e679 ) endfunction() From 6fa58a83a38e99eae75659130768e4f0b4768e0f Mon Sep 17 00:00:00 2001 From: Anthony Vogelweid Date: Wed, 12 Dec 2018 09:14:02 +0100 Subject: [PATCH 6/6] Change CoMISo commit tag --- cmake/LibiglDownloadExternal.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/LibiglDownloadExternal.cmake b/cmake/LibiglDownloadExternal.cmake index 4582751f1..05d25a43d 100644 --- a/cmake/LibiglDownloadExternal.cmake +++ b/cmake/LibiglDownloadExternal.cmake @@ -2,7 +2,7 @@ include(DownloadProject) # With CMake 3.8 and above, we can hide warnings about git being in a -# detached head by passing an extra GIT_CONFIG option +# detached head by passing an extra GIT_COFIG option if(NOT (${CMAKE_VERSION} VERSION_LESS "3.8.0")) set(LIBIGL_EXTRA_OPTIONS "GIT_CONFIG advice.detachedHead=false") else() @@ -35,7 +35,7 @@ endfunction() function(igl_download_comiso) igl_download_project(CoMISo GIT_REPOSITORY https://github.com/Anatoscope/CoMISo.git - GIT_TAG 2014196618d072ce7c9dbf6bd56f64f37829e679 + GIT_TAG b97463f97a152cb6bca31ef0fe3cfd4d13edff04 ) endfunction()