diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index a1a16cb6..1da4cee4 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -30,17 +30,10 @@ function(add_e2d_sample NAME)
     # resources
     #
 
-    if(MSVC)
-        add_custom_command(TARGET ${SAMPLE_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_CURRENT_SOURCE_DIR}/bin
-            ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/bin)
-    else(MSVC)
-        add_custom_command(TARGET ${SAMPLE_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_CURRENT_SOURCE_DIR}/bin
-            ${CMAKE_CURRENT_BINARY_DIR}/bin)
-    endif(MSVC)
+    add_custom_command(TARGET ${SAMPLE_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_CURRENT_SOURCE_DIR}/bin
+        $<TARGET_FILE_DIR:${SAMPLE_NAME}>/bin)
 endfunction(add_e2d_sample)
 
 add_e2d_sample(00)
diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt
index d4f69429..c2f40489 100644
--- a/untests/CMakeLists.txt
+++ b/untests/CMakeLists.txt
@@ -30,17 +30,10 @@ function(add_e2d_tests NAME)
     # resources
     #
 
-    if(MSVC)
-        add_custom_command(TARGET ${TESTS_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_CURRENT_SOURCE_DIR}/bin
-            ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/bin)
-    else(MSVC)
-        add_custom_command(TARGET ${TESTS_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy_directory
-            ${CMAKE_CURRENT_SOURCE_DIR}/bin
-            ${CMAKE_CURRENT_BINARY_DIR}/bin)
-    endif(MSVC)
+    add_custom_command(TARGET ${TESTS_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        ${CMAKE_CURRENT_SOURCE_DIR}/bin
+        $<TARGET_FILE_DIR:${TESTS_NAME}>/bin)
 
     #
     # tests