diff --git a/src/ifcgeom/kernels/CMakeLists.txt b/src/ifcgeom/kernels/CMakeLists.txt
index af5b415ef9..8128e37488 100644
--- a/src/ifcgeom/kernels/CMakeLists.txt
+++ b/src/ifcgeom/kernels/CMakeLists.txt
@@ -1,6 +1,6 @@
 message(STATUS "GEOMETRY_KERNELS ${GEOMETRY_KERNELS}")
 
-set(kernel_plugin_runtime_dir "${CMAKE_BINARY_DIR}/ifcgeom/$<CONFIG>")
+set(kernel_plugin_runtime_dir "$<TARGET_FILE_DIR:IfcGeom>")
 
 foreach(kernel ${GEOMETRY_KERNELS})
     string(TOUPPER ${kernel} KERNEL_UPPER)
diff --git a/src/ifcgeom/mapping/CMakeLists.txt b/src/ifcgeom/mapping/CMakeLists.txt
index 77778df425..63a9bdf65a 100644
--- a/src/ifcgeom/mapping/CMakeLists.txt
+++ b/src/ifcgeom/mapping/CMakeLists.txt
@@ -1,6 +1,6 @@
 find_package(Eigen3 REQUIRED)
 
-set(mapping_plugin_runtime_dir "${CMAKE_BINARY_DIR}/ifcgeom/$<CONFIG>")
+set(mapping_plugin_runtime_dir "$<TARGET_FILE_DIR:IfcGeom>")
 
 foreach(schema ${SCHEMA_VERSIONS})
     file(GLOB IFCGEOM_I_FILES *.i)
diff --git a/src/ifcviewer/CMakeLists.txt b/src/ifcviewer/CMakeLists.txt
index 70642acabf..458c52d9f3 100644
--- a/src/ifcviewer/CMakeLists.txt
+++ b/src/ifcviewer/CMakeLists.txt
@@ -40,10 +40,11 @@ set_target_properties(IfcViewer PROPERTIES
     MACOSX_BUNDLE ON
 )
 
+add_dependencies(IfcViewer ${kernel_libraries} ${mapping_libraries})
+
 target_link_libraries(IfcViewer PRIVATE
     IfcGeom
     IfcParse
-    ${kernel_libraries}
     ${OpenCASCADE_LIBRARIES}
     ${Boost_LIBRARIES}
     ${CGAL_LIBRARIES}