diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ba214cce..4e7003692 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -295,6 +295,7 @@ message("-- EVMJIT           Build LLVM-based JIT EVM (experimental!) ${EVMJIT}"
 message("------------------------------------------------------------------------")
 message("")
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
 set(CMAKE_THREAD_LIBS_INIT pthread)
 
 include(EthCompilerSettings)
diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake
index 1d1cb887b..d971a5f92 100644
--- a/cmake/EthExecutableHelper.cmake
+++ b/cmake/EthExecutableHelper.cmake
@@ -45,25 +45,26 @@ endmacro()
 
 macro(eth_copy_dlls EXECUTABLE DLLS)
 	# dlls must be unsubstitud list variable (without ${}) in format
-	# optimized;path_to_dll.dll;debug;path_to_dlld.dll 
+	# optimized;path_to_dll.dll;debug;path_to_dlld.dll
 	list(GET ${DLLS} 1 DLL_RELEASE)
 	list(GET ${DLLS} 3 DLL_DEBUG)
+	get_target_property(TARGET_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE} RUNTIME_OUTPUT_DIRECTORY)
 	add_custom_command(TARGET ${EXECUTABLE}
-		POST_BUILD 
-		COMMAND ${CMAKE_COMMAND} ARGS 
-		-DDLL_RELEASE="${DLL_RELEASE}" 
-		-DDLL_DEBUG="${DLL_DEBUG}" 
+		POST_BUILD
+		COMMAND ${CMAKE_COMMAND} ARGS
+		-DDLL_RELEASE="${DLL_RELEASE}"
+		-DDLL_DEBUG="${DLL_DEBUG}"
 		-DCONF="$<CONFIGURATION>"
-		-DDESTINATION="${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" 
+		-DDESTINATION="${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}"
 		-P "${ETH_SCRIPTS_DIR}/copydlls.cmake"
 	)
 endmacro()
 
-# 
+#
 # this function requires the following variables to be specified:
 # ETH_DEPENDENCY_INSTALL_DIR
 #
-# params: 
+# params:
 # QMLDIR
 #
 
@@ -74,7 +75,7 @@ macro(eth_install_executable EXECUTABLE)
 	set (one_value_args QMLDIR)
 	set (multi_value_args DLLS)
 	cmake_parse_arguments (ETH_INSTALL_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
-	
+
 	if (ETH_INSTALL_EXECUTABLE_QMLDIR)
 		if (APPLE)
 			set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}")
@@ -91,13 +92,14 @@ macro(eth_install_executable EXECUTABLE)
 			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 			COMMAND sh ${CMAKE_SOURCE_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents
 		)
-			
+
+		get_target_property(TARGET_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE} RUNTIME_OUTPUT_DIRECTORY)
 		# This tool and next will inspect linked libraries in order to determine which dependencies are required
 		if (${CMAKE_CFG_INTDIR} STREQUAL ".")
 			# TODO: This should only happen for GUI application
-			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}.app")
+			set(APP_BUNDLE_PATH "${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${EXECUTABLE}.app")
 		else ()
-			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
+			set(APP_BUNDLE_PATH "${TARGET_RUNTIME_OUTPUT_DIRECTORY}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
 		endif ()
 
 		install(CODE "
@@ -111,14 +113,15 @@ macro(eth_install_executable EXECUTABLE)
 		get_target_property(TARGET_LIBS ${EXECUTABLE} INTERFACE_LINK_LIBRARIES)
 		string(REGEX MATCH "Qt5::Core" HAVE_QT ${TARGET_LIBS})
 		if ("${HAVE_QT}" STREQUAL "Qt5::Core")
+			get_target_property(TARGET_RUNTIME_OUTPUT_DIRECTORY ${EXECUTABLE} RUNTIME_OUTPUT_DIRECTORY)
 			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-				COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
+				COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
 				WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 			)
 			#workaround for https://bugreports.qt.io/browse/QTBUG-42083
 			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
 				COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
-				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
+				WORKING_DIRECTORY ${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} VERBATIM
 			)
 		endif()
 
@@ -144,5 +147,3 @@ macro(eth_install_executable EXECUTABLE)
 	endif ()
 
 endmacro()
-
-
diff --git a/cmake/scripts/copydlls.cmake b/cmake/scripts/copydlls.cmake
index 6d86b8e4e..57eb0ffd4 100644
--- a/cmake/scripts/copydlls.cmake
+++ b/cmake/scripts/copydlls.cmake
@@ -14,5 +14,4 @@ else () # Debug
     set(DLL ${DLL_DEBUG})
 endif()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${DLL}" "${DESTINATION}")
-
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different  "${DLL}" "${DESTINATION}")
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index f8150806f..eb8fea95c 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -19,15 +19,10 @@ set(EXECUTABLE evmasm)
 
 file(GLOB HEADERS "*.h")
 
-if (ETH_STATIC)
-	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
-else()
-	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
-endif()
+add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
 target_link_libraries(${EXECUTABLE} evmcore)
 target_link_libraries(${EXECUTABLE} devcrypto)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
-