Explorar o código

Cleanup

Former-commit-id: e546482279a2a80e8aceb0a1647b5486ad5da07c
Jérémie Dumas %!s(int64=7) %!d(string=hai) anos
pai
achega
40c37fa327
Modificáronse 2 ficheiros con 2 adicións e 7 borrados
  1. 1 1
      .appveyor.yml
  2. 1 6
      shared/cmake/libigl.cmake

+ 1 - 1
.appveyor.yml

@@ -22,7 +22,7 @@ build_script:
   - cd ../../tutorial
   - mkdir build
   - cd build
-  - cmake -D "LIBIGL_USE_STATIC_LIBRARY=ON" -D "LIBIGL_WITH_ANTTWEAKBAR=OFF" -G "Visual Studio 15 2017 Win64" ../
+  - cmake -D "LIBIGL_USE_STATIC_LIBRARY=ON" -D "LIBIGL_WITH_ANTTWEAKBAR=OFF" -D "BOOST_ROOT=../external/boost/" -G "Visual Studio 15 2017 Win64" ../
   - set MSBuildLogger="C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
   - set MSBuildOptions=/v:m /p:Configuration=Debug /logger:%MSBuildLogger%
   - msbuild %MSBuildOptions% libigl_tutorials.sln

+ 1 - 6
shared/cmake/libigl.cmake

@@ -128,10 +128,7 @@ endif()
 if(LIBIGL_WITH_CGAL)
   # CGAL Core is needed for
   # `Exact_predicates_exact_constructions_kernel_with_sqrt`
-  set(BOOST_ROOT "${LIBIGL_EXTERNAL}/boost")
-  set(BOOST_LIBRARYDIR "${LIBIGL_EXTERNAL}/boost/lib")
-  set(BOOST_INCLUDEDIR "${LIBIGL_EXTERNAL}/boost/include/boost-1_65")
-  set(Boost_DEBUG ON CACHE BOOL "" FORCE)
+  # set(BOOST_ROOT "${LIBIGL_EXTERNAL}/boost")
   find_package(CGAL COMPONENTS Core)
   if(CGAL_FOUND)
     compile_igl_module("cgal")
@@ -140,8 +137,6 @@ if(LIBIGL_WITH_CGAL)
     endif()
     target_include_directories(igl_cgal ${IGL_SCOPE} "${GMP_INCLUDE_DIR}" "${MPFR_INCLUDE_DIR}")
     find_package(Boost 1.48 REQUIRED thread system)
-    message("Boost include: " ${Boost_INCLUDE_DIRS})
-    message("Boost include: " ${Boost_LIBRARIES})
     target_include_directories(igl_cgal ${IGL_SCOPE} ${CGAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
     target_link_libraries(igl_cgal ${IGL_SCOPE} CGAL::CGAL CGAL::CGAL_Core ${Boost_LIBRARIES})
   else()