diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e5505a..0007015 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/cmake/FindCGAL.cmake b/cmake/FindCGAL.cmake index 6aa18bf..dfc56b3 100644 --- a/cmake/FindCGAL.cmake +++ b/cmake/FindCGAL.cmake @@ -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() diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake index 7c216e8..bec9a43 100644 --- a/cmake/FindMOAB.cmake +++ b/cmake/FindMOAB.cmake @@ -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") @@ -20,4 +20,4 @@ else() message(STATUS "Found MOAB in ${MOAB_CMAKE_CONFIG}") include(${MOAB_CMAKE_CONFIG}/MOABConfig.cmake) set(MOAB_FOUND FALSE) -endif() \ No newline at end of file +endif() diff --git a/cmake/FindOCE.cmake b/cmake/FindOCE.cmake index 284081e..e8561f1 100644 --- a/cmake/FindOCE.cmake +++ b/cmake/FindOCE.cmake @@ -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() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5be84c0..19c5b25 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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)