Skip to content

Improved the build not building CGAL components if not found #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
makeclean wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved the build not building CGAL components if not found #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0ee8f
Improved the build not building CGAL components if not found
makeclean Oct 20, 2020
4e57e70
header file name change for OCE
makeclean Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ ELSEIF ( NOT OCE_FOUND AND OCC_FOUND )
SET(OPENCASCADE_INCLUDE_DIRS ${OpenCASCADE_INCLUDE_DIR})
ENDIF()

FIND_PACKAGE(CGAL REQUIRED COMPONENTS Core)
#FIND_PACKAGE(CGAL QUIET) # REQUIRED COMPONENTS Core)

IF(NOT CGAL_FOUND)
MESSAGE(STATUS "CGAL not found, not building CGAL components")
ENDIF()

ADD_SUBDIRECTORY(src)
11 changes: 8 additions & 3 deletions cmake/FindCGAL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,14 @@ find_path(CGAL_CMAKE_CONFIG NAMES CGALConfig.cmake
# ubuntu path
PATHS /usr/lib/x86_64-linux-gnu/
PATHS /usr/local/Cellar/cgal/4.12/lib/
PATHS /usr/include/CGAL
PATH_SUFFIXES lib Lib cmake cmake/CGAL
NO_DEFAULT_PATH)

message(STATUS "Found CGAL in ${CGAL_CMAKE_CONFIG}")

include(${CGAL_CMAKE_CONFIG}/CGALConfig.cmake)
if(CGAL_CMAKE_CONFIG_STREQUAL "CGAL_CMAKE_CONFIG-NOTFOUND")
set(CGAL_FOUND FALSE)
else()
set(CGAL_FOUND TRUE)
message(STATUS "Found CGAL in ${CGAL_CMAKE_CONFIG}")
include(${CGAL_CMAKE_CONFIG}/CGALConfig.cmake)
endif()
4 changes: 2 additions & 2 deletions cmake/FindMOAB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
find_path(MOAB_CMAKE_CONFIG NAMES MOABConfig.cmake
HINTS ${MOAB_ROOT}
PATHS ENV LD_LIBRARY_PATH DYLD_LIBRARY_PATH
PATH_SUFFIXES lib Lib cmake cmake/MOAB lib/cmake/MOAB
PATH_SUFFIXES lib Lib lib64 cmake cmake/MOAB lib/cmake/MOAB lib64/cmake/MOAB
NO_DEFAULT_PATH)

if( MOAB_CMAKE_CONFIG STREQUAL "MOAB_CMAKE_CONFIG-NOTFOUND")
Expand All @@ -20,4 +20,4 @@ else()
message(STATUS "Found MOAB in ${MOAB_CMAKE_CONFIG}")
include(${MOAB_CMAKE_CONFIG}/MOABConfig.cmake)
set(MOAB_FOUND FALSE)
endif()
endif()
1 change: 1 addition & 0 deletions cmake/FindOCE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ else()
set(OCE_FOUND TRUE)
message(STATUS "Found OCE in ${OCE_CMAKE_CONFIG}")
include(${OCE_CMAKE_CONFIG}/OCEConfig.cmake)
add_definitions(-DOCE)
endif()
52 changes: 27 additions & 25 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,32 @@ ADD_LIBRARY(dagmc_topology dagmc_topology.cc)
ADD_EXECUTABLE(dagmc_merge dagmc_merge.cc)
TARGET_LINK_LIBRARIES(dagmc_merge dagmc_topology ${MOAB_LIBRARIES})

# slcing library
ADD_LIBRARY(dagmc_slicer dagmc_slicer.cc)
TARGET_LINK_LIBRARIES(dagmc_slicer ${MOAB_LIBRARIES} ${CGAL_LIBRARIES} boost_system gmp)

# dagmc slicer
ADD_EXECUTABLE(dagmc_slice_tool dagmc_slice_tool.cc)
TARGET_LINK_LIBRARIES(dagmc_slice_tool dagmc_slicer ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp)

# dagmc 2d mesher
ADD_EXECUTABLE(dagmc_2d_mesh dagmc_2d_mesh.cc)
#ADD_DEFINITIONS(-DCGAL_USE_BASIC_VIEWER)
TARGET_LINK_LIBRARIES(dagmc_2d_mesh dagmc_slicer vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp)

# dagmc 3d mesher
ADD_EXECUTABLE(dagmc_mesher dagmc_mesher.cc)
TARGET_LINK_LIBRARIES(dagmc_mesher vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp mpfr)

# dagmc_overlap
ADD_EXECUTABLE(dagmc_overlap preper.cc)
TARGET_LINK_LIBRARIES(dagmc_overlap vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp mpfr)

INSTALL(TARGETS dagmc_slicer DESTINATION bin)
INSTALL(TARGETS dagmc_merge DESTINATION bin)
INSTALL(TARGETS dagmc_overlap DESTINATION bin)
INSTALL(TARGETS dagmc_2d_mesh DESTINATION bin)
IF(CGAL_FOUND)
# slcing library
ADD_LIBRARY(dagmc_slicer dagmc_slicer.cc)
TARGET_LINK_LIBRARIES(dagmc_slicer ${MOAB_LIBRARIES} ${CGAL_LIBRARIES} boost_system gmp)

# dagmc slicer
ADD_EXECUTABLE(dagmc_slice_tool dagmc_slice_tool.cc)
TARGET_LINK_LIBRARIES(dagmc_slice_tool dagmc_slicer ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp)

# dagmc 2d mesher
ADD_EXECUTABLE(dagmc_2d_mesh dagmc_2d_mesh.cc)
#ADD_DEFINITIONS(-DCGAL_USE_BASIC_VIEWER)
TARGET_LINK_LIBRARIES(dagmc_2d_mesh dagmc_slicer vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp)

# dagmc 3d mesher
ADD_EXECUTABLE(dagmc_mesher dagmc_mesher.cc)
TARGET_LINK_LIBRARIES(dagmc_mesher vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp mpfr)

# dagmc_overlap
ADD_EXECUTABLE(dagmc_overlap preper.cc)
TARGET_LINK_LIBRARIES(dagmc_overlap vertex_inserter ${MOAB_LIBRARIES} ${CGAL_LIBRARY} boost_system boost_program_options gmp mpfr)

INSTALL(TARGETS dagmc_slicer DESTINATION bin)
INSTALL(TARGETS dagmc_merge DESTINATION bin)
INSTALL(TARGETS dagmc_overlap DESTINATION bin)
INSTALL(TARGETS dagmc_2d_mesh DESTINATION bin)
ENDIF()

ADD_SUBDIRECTORY(test)