tested with CGAL-6.0

LiangliangNan · Nov 19, 2024 · d619167 · d619167
1 parent 56e8cce
commit d619167
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/code/method/CMakeLists.txt b/code/method/CMakeLists.txt
@@ -32,7 +32,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 find_package(CGAL REQUIRED)
 if (CGAL_FOUND)
     message(STATUS "Found CGAL ${CGAL_VERSION}")
-    include(${CGAL_USE_FILE})
     target_link_libraries(${PROJECT_NAME} ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES})
 else ()
     message(FATAL_ERROR "CGAL is required.")

diff --git a/code/method/alpha_shape_CGAL4.11_and_later.h b/code/method/alpha_shape_CGAL4.11_and_later.h
@@ -80,8 +80,8 @@ class Alpha_shape_2 : public Dt
   typedef Type_of_alpha               FT;
 
   //check simplices are correctly instantiated
-  CGAL_static_assertion( (boost::is_same<NT, typename Dt::Face::NT>::value) );
-  CGAL_static_assertion( (boost::is_same<NT, typename Dt::Vertex::NT>::value) );
+  static_assert( (boost::is_same<NT, typename Dt::Face::NT>::value) );
+  static_assert( (boost::is_same<NT, typename Dt::Vertex::NT>::value) );
 
   typedef typename Dt::Point Point;
 

diff --git a/code/renderer/CMakeLists.txt b/code/renderer/CMakeLists.txt
@@ -25,6 +25,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${POLYFIT_glew_DIR}/include)
 
+set(OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${OPENGL_LIBRARIES} basic math model 3rd_glew)