cmake improvements on windows

CMakeLists.txt

@@ -1,5 +1,8 @@
 # cmake global
 cmake_minimum_required(VERSION 2.8.9)
+# let cmake autolink dependencies on windows
+# it's specified globally, cause qt libraries requires that on windows and they are also found globally
+cmake_policy(SET CMP0020 NEW)
 
 project(ethereum)
 

alethzero/CMakeLists.txt

@@ -1,4 +1,6 @@
 cmake_policy(SET CMP0015 NEW)
+# let cmake autolink dependencies on windows
+cmake_policy(SET CMP0020 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
 if (APPLE)

libjsqrc/CMakeLists.txt

@@ -1,7 +1,9 @@
 cmake_policy(SET CMP0015 NEW)
+# let cmake autolink dependencies on windows
+cmake_policy(SET CMP0020 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
-if (APPLE)
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
 	cmake_policy(SET CMP0043 OLD)
 endif()
 set(CMAKE_AUTOMOC OFF)

libqethereum/CMakeLists.txt

@@ -1,7 +1,9 @@
 cmake_policy(SET CMP0015 NEW)
+# let cmake autolink dependencies on windows
+cmake_policy(SET CMP0020 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
-if (APPLE)
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
 	# old policy do not use MACOSX_RPATH
 	cmake_policy(SET CMP0042 OLD)
 	cmake_policy(SET CMP0043 OLD)

libqethereum/QEthereum.cpp

@@ -227,11 +227,3 @@ void QWebThreeConnector::onProcessData(QString const& _json, QString const& _add
 	OnRequest(_json.toStdString(), (void*)&_addInfo);
 }
 
-// extra bits needed to link on VS
-#ifdef _MSC_VER
-
-// include moc file, ofuscated to hide from automoc
-#include\
-"moc_QEthereum.cpp"
-
-#endif

libqethereum/QmlEthereum.cpp

@@ -178,11 +178,3 @@ void QmlEthereum::transact(Secret _secret, Address _dest, u256 _amount, u256 _ga
 
 #endif
 
-// extra bits needed to link on VS
-#ifdef _MSC_VER
-
-// include moc file, ofuscated to hide from automoc
-#include\
-"moc_QmlEthereum.cpp"
-
-#endif

mix/CMakeLists.txt

@@ -1,7 +1,9 @@
 cmake_policy(SET CMP0015 NEW)
+# let cmake autolink dependencies on windows
+cmake_policy(SET CMP0020 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
-if (APPLE)
+if (${CMAKE_MAJOR_VERSION} GREATER 2)
 	cmake_policy(SET CMP0043 OLD)
 endif()
 

third/CMakeLists.txt

@@ -1,4 +1,6 @@
 cmake_policy(SET CMP0015 NEW)
+# let cmake autolink dependencies on windows
+cmake_policy(SET CMP0020 NEW)
 # this policy was introduced in cmake 3.0
 # remove if, once 3.0 will be used on unix
 if (APPLE)

third/MainWin.cpp

@@ -611,15 +611,3 @@ void Main::on_mine_triggered()
 	else
 		ethereum()->stopMining();
 }
-
-// extra bits needed to link on VS
-#ifdef _MSC_VER
-
-// include moc file, ofuscated to hide from automoc
-#include\
-"moc_MainWin.cpp"
-
-#include\
-"moc_MiningView.cpp"
-
-#endif