build: offer windows 64 bit build (issue #300)

* update to clang/llvm to 3.9
* update to qt 5.8
* fixed windows javapathdetector for 64 bit java.
* added LibGui as dependency to tests
* fixed legacy Java 6 install necessary on MacOS
* fixed setting of user path for 64 bit build
* added missing pngs to windows installer
* renamed graph zoom button images
* reverted moving of setupLogging call to fix crash on deployed exe

fortune cookie message = An old acquaintance will enter your life.

cmake/CLANGConfig.cmake

@@ -9,7 +9,11 @@ if (UNIX AND APPLE)
 elseif(UNIX)
 	set(CLANG_BUILD_PATH "$ENV{LLVM_DIR}")
 else()
-	set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build")
+	if(${WINXXBITS} STREQUAL "Win32")
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win32")
+	else()
+		set(CLANG_BUILD_PATH "$ENV{CLANG_DIR}/build_win64")
+	endif()
 endif()
 
 if (UNIX AND NOT APPLE)

cmake/LinuxPackage.cmake

@@ -158,11 +158,10 @@ INSTALL(PROGRAMS
 	COMPONENT FULL
 )
 
-INSTALL(PROGRAMS
-	${CMAKE_SOURCE_DIR}/bin/app/Release/Coati_upx
+INSTALL(TARGETS
+	${APP_PROJECT_NAME}
 	DESTINATION Coati
 	COMPONENT FULL
-	RENAME Coati
 )
 
 # SET(CPACK_GENERATOR "DEB;TGZ")

cmake/licenses.cmake

@@ -36,5 +36,5 @@ set(LICENSE_ARRAY "${LICENSE_ARRAY}\n")
 
 configure_file(
     ${CMAKE_SOURCE_DIR}/cmake/licenses.h.in
-    ${CMAKE_SOURCE_DIR}/build/src/lib_gui/licenses.h
+    ${CMAKE_BINARY_DIR}/src/lib_gui/licenses.h
 )

cmake/pre_install_linux.cmake

@@ -12,38 +12,21 @@ function(Run)
 endfunction()
 
 # upx
-	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../bin/app/Release)
+	set(upxPath ${CMAKE_CURRENT_LIST_DIR}/../build/Release/app)
 
 	execute_process(
 		COMMAND ${upxPath}/Coati -z ${CMAKE_CURRENT_LIST_DIR}/../setup/license.txt
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tictactoe/tictactoe.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tictactoe/tictactoe.coatiproject
 	)
 
 	execute_process(
-		COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/tutorial/tutorial.coatiproject
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/tutorial/tutorial.coatiproject
 	)
 
 	execute_process(
-			COMMAND ${upxPath}/Coati -f -d ${upxPath}/../user/projects/javaparser/javaparser.coatiproject
-	)
-SET (NO_UPX 1)
-
-if (NO_UPX)
-	execute_process(
-		COMMAND echo "UPX"
+		COMMAND ${upxPath}/Coati -f -d ${CMAKE_CURRENT_LIST_DIR}/../bin/app/user/projects/javaparser/javaparser.coatiproject
 	)
 
-	execute_process(
-		COMMAND rm ${upxPath}/Coati_upx
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${upxPath}/Coati ${upxPath}/Coati_upx
-	)
-else()
-	Print("Remove old Coati_upx")
-	Run(rm ${upxPath}/Coati_upx)
-	Print("upx Coati")
-	Run(upx --brute ${upxPath}/Coati -o ${upxPath}/Coati_upx)
-endif()
-

cmake/publicKey.cmake

@@ -20,5 +20,5 @@ endif()
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/PublicKey.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_license/PublicKey.h
+  ${CMAKE_BINARY_DIR}/src/lib_license/PublicKey.h
 )

cmake/setWinXxBits.cmake

@@ -0,0 +1,13 @@
+string(REGEX MATCH "64" MATCH_64 ${CMAKE_GENERATOR})
+
+if("${MATCH_64}" STREQUAL "64")
+	message(STATUS "Target is 64 bits")
+		if (WIN32)
+			set(WINXXBITS Win64)
+		endif(WIN32)
+else()
+	message(STATUS "Target is 32 bits")
+		if (WIN32)
+			set(WINXXBITS Win32)
+		endif(WIN32)
+endif()

cmake/version.cmake

@@ -44,5 +44,5 @@ message(STATUS "Git version number: " ${GIT_VERSION_NUMBER} )
 
 configure_file(
   ${CMAKE_SOURCE_DIR}/cmake/version.h.in
-  ${CMAKE_SOURCE_DIR}/build/src/lib_gui/version.h
+  ${BINARY_DIR}/src/lib_gui/version.h
 )