Merge pull request #653 from debris/cpack_improvements

Cpack improvements

CMakeLists.txt

@@ -165,6 +165,8 @@ if (WIN32)
 	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
 	set(CPACK_PACKAGE_VERSION "0.7")
 	set(CPACK_GENERATOR "NSIS")
+	# seems to be not working
+	# set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.bmp")
 
 	# our stuff
 	set(CPACK_COMPONENT_ALETHZERO_GROUP "Applications")
@@ -178,6 +180,8 @@ if (WIN32)
 	set(CPACK_NSIS_URL_INFO_ABOUT "https://github.com/ethereum/cpp-ethereum")
 	set(CPACK_NSIS_CONTACT "ethereum.org")
 	set(CPACK_NSIS_MODIFY_PATH ON)
+	set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.ico")
+	set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/alethzero/alethzero.ico")
 
 	include(CPack)
 endif (WIN32)

alethzero/CMakeLists.txt

@@ -27,6 +27,7 @@ endif ()
 eth_add_executable(${EXECUTABLE} 
 	ICON alethzero 
 	UI_RESOURCES alethzero.icns Main.ui
+	WIN_RESOURCES alethzero.rc
 )
 
 add_dependencies(${EXECUTABLE} BuildInfo.h)

alethzero/alethzero.rc

@@ -0,0 +1 @@
+APP_ICON ICON DISCARDABLE "alethzero.ico"

cmake/EthExecutableHelper.cmake

@@ -18,7 +18,7 @@ macro(eth_add_executable EXECUTABLE)
 	set (extra_macro_args ${ARGN})
 	set (options)
 	set (one_value_args ICON)
-	set (multi_value_args UI_RESOURCES)
+	set (multi_value_args UI_RESOURCES WIN_RESOURCES)
 	cmake_parse_arguments (ETH_ADD_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
 
 	if (APPLE)
@@ -38,7 +38,7 @@ macro(eth_add_executable EXECUTABLE)
 		set_source_files_properties(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
 	else ()
-		add_executable(${EXECUTABLE} ${ETH_ADD_EXECUTABLE_UI_RESOURCES} ${SRC_LIST} ${HEADERS})
+		add_executable(${EXECUTABLE} ${ETH_ADD_EXECUTABLE_UI_RESOURCES}  ${ETH_ADD_EXECUTABLE_WIN_RESOURCES} ${SRC_LIST} ${HEADERS})
 	endif()
 
 endmacro()
@@ -60,7 +60,11 @@ macro(eth_install_executable EXECUTABLE)
 	cmake_parse_arguments (ETH_INSTALL_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}")
 	
 	if (ETH_INSTALL_EXECUTABLE_QMLDIR)
-		set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}")
+		if (APPLE)
+			set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}")
+		elseif (WIN32)
+			set(eth_qml_dir --qmldir ${ETH_INSTALL_EXECUTABLE_QMLDIR})
+		endif()
 		message(STATUS "${EXECUTABLE} qmldir: ${eth_qml_dir}")
 	endif()
 
@@ -68,7 +72,8 @@ macro(eth_install_executable EXECUTABLE)
 		# First have qt5 install plugins and frameworks
 		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
 			COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app ${eth_qml_dir}
-			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+		)
 			
 		# This tool and next will inspect linked libraries in order to determine which dependencies are required
 		if (${CMAKE_CFG_INTDIR} STREQUAL ".")
@@ -108,6 +113,13 @@ macro(eth_install_executable EXECUTABLE)
 			$<TARGET_FILE_DIR:${EXECUTABLE}>/platforms
 		)
 
+		# ugly way, improve that
+		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
+			COMMAND cmake -E copy_directory
+			"${ETH_DEPENDENCY_INSTALL_DIR}/qml"
+			$<TARGET_FILE_DIR:${EXECUTABLE}>
+		)
+
 		install( FILES ${DLLS} 
 			DESTINATION bin
 			COMPONENT ${EXECUTABLE}
@@ -118,6 +130,14 @@ macro(eth_install_executable EXECUTABLE)
 			COMPONENT ${EXECUTABLE}
 		)
 
+		file (GLOB QMLS ${ETH_DEPENDENCY_INSTALL_DIR}/qml/*)
+		foreach(QML ${QMLS})
+			install( DIRECTORY ${QML} 
+				DESTINATION bin
+				COMPONENT ${EXECUTABLE}
+			)
+		endforeach()
+
 		install( TARGETS ${EXECUTABLE} RUNTIME 
 			DESTINATION bin
 			COMPONENT ${EXECUTABLE}