Commit 8efe08de authored by Deepak Rangarajan's avatar Deepak Rangarajan Committed by Mark Meredith
Browse files

Dr/cleaner conan cmake

parent 3648bf83

CMakeLists.txt

+1 −3
Original line number Diff line number Diff line
@@ -30,9 +30,7 @@ conan_cmake_run(REQUIRES 
  catch2/2.12.1

  cgal/5.0.2

  pegtl/2.8.1@taocpp/stable

  BASIC_SETUP)



list(APPEND CMAKE_MODULE_PATH "${CONAN_LIB_DIRS_CATCH2}/cmake/Catch2")

  BASIC_SETUP CMAKE_TARGETS)



include(CTest)

include(Catch)

src/csg/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ target_sources(csg PRIVATE 
target_include_directories(csg INTERFACE ${CMAKE_SOURCE_DIR})

target_link_libraries(csg PRIVATE

                      stdc++fs

                      ${CONAN_PKG_LIBS_CGAL}

                      ${CONAN_PKG_LIBS_MPIR}

                      CONAN_PKG::cgal

                      )



add_subdirectory(tests)

src/csg/tests/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ add_executable(unit_tests_csg EXCLUDE_FROM_ALL 
target_include_directories(unit_tests_csg PRIVATE

  ..

  ../impl

  ${CONAN_INCLUDE_DIRS_CATCH2}

  )



target_link_libraries(unit_tests_csg csg)