diff --git a/CMakeLists.txt b/CMakeLists.txt
index 511dcc032f3c753653e18a3cf0ccacce5eb0f06b..4d0c5ce56bdadd995ad4ebcc3ab95d4766104e7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/src/csg/CMakeLists.txt b/src/csg/CMakeLists.txt
index 68d417d8bdc47a180cde7485ffe66a56c9bae9c9..58162524645cf4a39d77f107df0c66ec13c9e722 100644
--- a/src/csg/CMakeLists.txt
+++ b/src/csg/CMakeLists.txt
@@ -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)
\ No newline at end of file
+add_subdirectory(tests)
diff --git a/src/csg/tests/CMakeLists.txt b/src/csg/tests/CMakeLists.txt
index e7282dffec9a68f6cb863eba7240b02a941557ee..5476ad70989482defa76cef2ef91410f0a012b12 100644
--- a/src/csg/tests/CMakeLists.txt
+++ b/src/csg/tests/CMakeLists.txt
@@ -19,10 +19,11 @@ 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)
 
 add_test(NAME run_csg_unittests
          COMMAND ${CMAKE_COMMAND} -E env ${CMAKE_BINARY_DIR}/bin/unit_tests_csg
-         )
\ No newline at end of file
+         )