Skip to content

Commit

Permalink
cgal.
Browse files Browse the repository at this point in the history
  • Loading branch information
luca-heltai committed Jul 20, 2024
1 parent 91778d7 commit ff5b542
Showing 1 changed file with 5 additions and 18 deletions.
23 changes: 5 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
option(PREFER_CGAL_OVER_PARMOONOLITH "If both CGAL and PARMOONOLITH are found, use CGAL in compute_intersections." ON)
ADD_COMPILE_DEFINITIONS(DEAL_II_PREFER_CGAL_OVER_PARMOONOLITH)

# # CGAL
# set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE "TRUE")
# find_package(CGAL)
# if(CGAL_FOUND)
# ADD_COMPILE_DEFINITIONS(DEAL_II_WITH_CGAL)
# if(PREFER_CGAL_OVER_PARMOONOLITH)
# ADD_COMPILE_DEFINITIONS(DEAL_II_PREFER_CGAL_OVER_PARMOONOLITH)
# endif()
# MESSAGE("-- DEAL_II_WITH_CGAL = ON")
# else()
# MESSAGE("-- DEAL_II_WITH_CGAL = OFF")
# ENDIF(CGAL_FOUND)

# ParMoonolith
find_package(ParMoonolith HINTS /usr/local/lib/cmake)
if(ParMoonolith_FOUND)
Expand Down Expand Up @@ -66,9 +53,9 @@ FOREACH(_build_type ${_d2_build_types})
MESSAGE("-- Configuring library ${_lib}")

ADD_LIBRARY(${_lib} SHARED ${LIB_SOURCES} ${LIB_HEADERS})
if(CGAL_FOUND)
target_link_libraries(${_lib} CGAL::CGAL)
endif()
# if(CGAL_FOUND)
# target_link_libraries(${_lib} CGAL::CGAL)
# endif()

if(ParMoonolith_FOUND)
target_link_libraries(${_lib} ParMoonolith::par_moonolith)
Expand Down Expand Up @@ -108,7 +95,7 @@ FOREACH(_build_type ${_d2_build_types})
INCLUDE_DIRECTORIES(./include/ ${GTEST_INCLUDE_DIRS})

ENABLE_TESTING()
GTEST_DISCOVER_TESTS(${fsi_test})
# GTEST_DISCOVER_TESTS(${fsi_test})
MESSAGE("-- Configured Gtest executable ${fsi_test}")
ENDIF(GTest_FOUND)
endif()
Expand Down Expand Up @@ -136,4 +123,4 @@ add_custom_target(copyright
${CMAKE_CURRENT_SOURCE_DIR}/scripts/update_copyright.sh
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Updating copyright information" VERBATIM)
MESSAGE("-- Configured Copyright")
MESSAGE("-- Configured Copyright")

0 comments on commit ff5b542

Please sign in to comment.