common changes

extdep/icu.cmake

@@ -8,7 +8,7 @@ ExternalProject_Add(icu
 	BINARY_DIR icu-prefix/src/icu
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND ""
-	INSTALL_COMMAND cmd /c cp lib/*.lib ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp -R include/unicode ${ETH_DEPENDENCY_INSTALL_DIR}/include
+	INSTALL_COMMAND cmd /c cp lib/* ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp -R include/uni ${ETH_DEPENDENCY_INSTALL_DIR}/include && cp bin/* ${ETH_DEPENDENCY_INSTALL_DIR}/bin
 	)
 
 else()

extdep/qt.cmake

@@ -5,11 +5,12 @@ ExternalProject_Add(qt
 	DEPENDS icu jom
 	URL http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.gz
 	BINARY_DIR qt-prefix/src/qt
+	UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools.bat
 	PATCH_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/configure.bat qtbase
 	CONFIGURE_COMMAND configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -opensource -confirm-license -release -opengl desktop -platform win32-msvc2013 -icu -I ${ETH_DEPENDENCY_INSTALL_DIR}/include -L ${ETH_DEPENDENCY_INSTALL_DIR}/lib -nomake tests -nomake examples
-	
-	BUILD_COMMAND cmd /c ${CMAKE_CURRENT_SOURCE_DIR}/tools.bat && jom
-	INSTALL_COMMAND cmd /c ${CMAKE_CURRENT_SOURCE_DIR}/tools.bat && jom install
+
+	BUILD_COMMAND nmake
+	INSTALL_COMMAND nmake install
 	)
 
 ExternalProject_Add_Step(qt configure_paths