diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3324a5b44d3d1be111f8ce67563d15a22aef38dc..314df7fa278bf4e58935adb8a5af210da93494a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,12 +160,11 @@ add_library(tadah
     $<TARGET_OBJECTS:tadah.core.obj>
     $<TARGET_OBJECTS:tadah.models.obj>
     $<TARGET_OBJECTS:tadah.mlip.obj>
+    $<TARGET_OBJECTS:config::rc>
     )
 
 add_executable (ta-dah bin/tadah.cpp)
 target_link_libraries(ta-dah PRIVATE tadah)
-target_link_libraries(tadah PRIVATE config::rc)
-target_link_libraries(ta-dah PRIVATE config::rc)
 
 #########################################################################
 if(TADAH_MARCH_NATIVE)
@@ -314,6 +313,7 @@ message(STATUS "${TADAH}: Build with OpenMP is ${TADAH_ENABLE_OPENMP}")
 
 find_package(LAPACK)
 target_link_libraries (ta-dah PRIVATE ${LAPACK_LIBRARIES})
+target_link_libraries (tadah PUBLIC ${LAPACK_LIBRARIES})
 
 install(TARGETS ta-dah DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 install(TARGETS tadah DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c31509144028914066020fe5cc036f9a50f8daaa..f274757b27cca3b4246abe03f5838bff0dbf3e6c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -3,10 +3,7 @@ file(GLOB tests_src "*.cpp")
 #file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/tests_data DESTINATION .)
 
 add_executable(test_tadah ${tests_src})
-target_link_libraries(test_tadah PRIVATE 
-    Catch2 tadah config::rc)
-find_package(LAPACK)
-target_link_libraries (test_tadah PRIVATE ${LAPACK_LIBRARIES})
+target_link_libraries(test_tadah PRIVATE Catch2 tadah)
 
 include(Catch.cmake)
 catch_discover_tests(test_tadah)