Merge pull request #1883 from ethereum/revert-1855-pr/cmake_runtime_output_directory

Revert "CMake: set default RUNTIME_OUTPUT_DIRECTORY property to "bin""

CMakeLists.txt

@@ -295,7 +295,6 @@ 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)

cmake/EthExecutableHelper.cmake

@@ -48,14 +48,13 @@ macro(eth_copy_dlls EXECUTABLE DLLS)
 	# 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}" 
 		-DCONF="$<CONFIGURATION>"
-		-DDESTINATION="${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}"
+		-DDESTINATION="${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" 
 		-P "${ETH_SCRIPTS_DIR}/copydlls.cmake"
 	)
 endmacro()
@@ -88,15 +87,19 @@ macro(eth_install_executable EXECUTABLE)
 	if (APPLE)
 		# First have qt5 install plugins and frameworks
 		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND ${MACDEPLOYQT_APP} ${EXECUTABLE}.app -executable=${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir}
+			COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app -executable=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir}
-			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
+			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-			COMMAND sh ${CMAKE_SOURCE_DIR}/macdeployfix.sh ${EXECUTABLE}.app/Contents
+			COMMAND sh ${CMAKE_SOURCE_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents
 		)
 			
-		# TODO: This should only happen for GUI application
-		set(APP_BUNDLE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INDIR}/${EXECUTABLE}.app")
-
 		# 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")
+		else ()
+			set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app")
+		endif ()
+
 		install(CODE "
 			include(BundleUtilities)
 			set(BU_CHMOD_BUNDLE_ITEMS 1)
@@ -108,15 +111,14 @@ 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} ${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
+				COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${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 ${TARGET_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} VERBATIM
+				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
 			)
 		endif()
 
@@ -142,3 +144,5 @@ macro(eth_install_executable EXECUTABLE)
 	endif ()
 
 endmacro()
+
+

cmake/scripts/copydlls.cmake

@@ -14,4 +14,5 @@ else () # Debug
     set(DLL ${DLL_DEBUG})
 endif()
 
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different  "${DLL}" "${DESTINATION}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${DLL}" "${DESTINATION}")
+

libevmasm/CMakeLists.txt

@@ -19,10 +19,15 @@ set(EXECUTABLE evmasm)
 
 file(GLOB HEADERS "*.h")
 
-add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
+if (ETH_STATIC)
+	add_library(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS})
+else()
+	add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS})
+endif()
 
 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} )
+

test/CMakeLists.txt

@@ -95,12 +95,6 @@ if (JSONRPC)
 	target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES})
 endif()
 
-if (UNIX) # Create symlink to old testeth location to make bildbot happy
-	add_custom_command(TARGET testeth POST_BUILD
-		COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_BINARY_DIR}/bin/testeth ${CMAKE_BINARY_DIR}/test/testeth
-	)
-endif()
-
 enable_testing()
 set(CTEST_OUTPUT_ON_FAILURE TRUE)
 
@@ -119,3 +113,4 @@ eth_add_test(JsonRpc
 	ARGS --eth_testfile=BlockTests/bcJS_API_Test 
 	ARGS --eth_testfile=BlockTests/bcValidBlockTest
 )
+