Merge pull request #94 from CodeShark/cmake_fixes

Cmake fixes

.gitignore

@@ -19,6 +19,9 @@ ipch
 *.opensdf
 *.suo
 
+# Generated headers
+*.h
+
 *.user
 *.user.*
 *~

BuildInfo.sh

@@ -0,0 +1,55 @@
+CURRENT_SOURCE_DIR=$1
+CURRENT_BINARY_DIR=$2
+BUILD_TYPE=$3
+BUILD_PLATFORM=$4
+
+echo "Current source dir: $CURRENT_SOURCE_DIR"
+echo "Current binary dir: $CURRENT_BINARY_DIR"
+echo "Build type: $BUILD_TYPE"
+echo "Build platform: $BUILD_PLATFORM"
+
+if [[ -e "$CURRENT_SOURCE_DIR/BuildInfo.h" ]]
+then
+	echo "Using existing BuildInfo.h"
+	cp $CURRENT_SOURCE_DIR/BuildInfo.h $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+else
+	if [[ -e "$CURRENT_SOURCE_DIR/.git" ]]
+	then
+		ETH_COMMIT_HASH=$(git --git-dir=$CURRENT_SOURCE_DIR/.git --work-tree=$CURRENT_SOURCE_DIR rev-parse HEAD)
+		ETH_LOCAL_CHANGES=$(git --git-dir=$CURRENT_SOURCE_DIR/.git --work-tree=$CURRENT_SOURCE_DIR diff --shortstat)
+		if [[ -z "$ETH_LOCAL_CHANGES" ]]
+		then
+			ETH_CLEAN_REPO=1
+		else
+			ETH_CLEAN_REPO=0
+		fi
+
+		echo "Commit hash: ${ETH_COMMIT_HASH} (Clean: ${ETH_CLEAN_REPO} - ${ETH_LOCAL_CHANGES})"
+	else
+		echo "Unknown repo."
+		ETH_COMMIT_HASH=0
+		ETH_CLEAN_REPO=1
+	fi
+
+	echo "// This file was automatically generated by cmake" > $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "#pragma once" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "#define ETH_COMMIT_HASH $ETH_COMMIT_HASH" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "#define ETH_CLEAN_REPO $ETH_CLEAN_REPO" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "#define ETH_BUILD_TYPE $BUILD_TYPE" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	echo "#define ETH_BUILD_PLATFORM $BUILD_PLATFORM" >> $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+fi
+
+if [[ -e "$CURRENT_BINARY_DIR/BuildInfo.h" ]]
+then
+	DIFF=$(diff $CURRENT_BINARY_DIR/BuildInfo.h $CURRENT_BINARY_DIR/BuildInfo.h.tmp)
+	if [[ -z "$DIFF" ]]
+	then
+		rm $CURRENT_BINARY_DIR/BuildInfo.h.tmp
+	else
+		mv $CURRENT_BINARY_DIR/BuildInfo.h.tmp $CURRENT_BINARY_DIR/BuildInfo.h
+	fi
+else
+	mv $CURRENT_BINARY_DIR/BuildInfo.h.tmp $CURRENT_BINARY_DIR/BuildInfo.h
+fi

CMakeLists.txt

@@ -141,26 +141,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Generate header file containing useful build information
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.h)
+add_custom_target(BuildInfo.h ALL COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/BuildInfo.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BUILD_TYPE} ${ETH_BUILD_PLATFORM})
-else()
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-	if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
-		execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} rev-parse HEAD OUTPUT_VARIABLE ETH_COMMIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE)
-		execute_process(COMMAND git --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git --work-tree=${CMAKE_CURRENT_SOURCE_DIR} diff --shortstat OUTPUT_VARIABLE ETH_LOCAL_CHANGES OUTPUT_STRIP_TRAILING_WHITESPACE)
-		if("x${ETH_LOCAL_CHANGES}" STREQUAL "x")
-			set(ETH_CLEAN_REPO 1)
-		else()
-			set(ETH_CLEAN_REPO 0)
-		endif()
-		message("Commit Hash: ${ETH_COMMIT_HASH} (Clean: ${ETH_CLEAN_REPO} - ${ETH_LOCAL_CHANGES})")
-	else()
-		message("Unknown repo.")
-		set(ETH_COMMIT_HASH 0)
-		set(ETH_CLEAN_REPO 1)
-	endif()
-	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "// This file was automatically generated by cmake\n#pragma once\n\n")
-	file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/BuildInfo.h "#define ETH_COMMIT_HASH ${ETH_COMMIT_HASH}\n#define ETH_CLEAN_REPO ${ETH_CLEAN_REPO}\n#define ETH_BUILD_TYPE ${CMAKE_BUILD_TYPE}\n#define ETH_BUILD_PLATFORM ${ETH_BUILD_PLATFORM}\n")
-	include_directories(${CMAKE_CURRENT_BINARY_DIR})
-endif()
 
 add_subdirectory(secp256k1)
 add_subdirectory(libethereum)

alethzero/CMakeLists.txt

@@ -87,10 +87,12 @@ elseif (${TARGET_PLATFORM} STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-keep-inline-dllexport -static-libgcc -static-libstdc++ -static")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-s -Wl,-subsystem,windows -mthreads -L/usr/x86_64-w64-mingw32/plugins/platforms")
 	target_link_libraries(${EXECUTEABLE} gcc)
-	target_link_libraries(${EXECUTEABLE} mingw32 qtmain mswsock iphlpapi qwindows shlwapi Qt5PlatformSupport gdi32 comdlg32 oleaut32 imm32 winmm ole32 uuid ws2_32)
+	target_link_libraries(${EXECUTEABLE} mingw32 qtmain mswsock iphlpapi qwindows shlwapi Qt5PlatformSupport opengl32 gdi32 comdlg32 oleaut32 imm32 winmm ole32 uuid ws2_32)
 	target_link_libraries(${EXECUTEABLE} boost_system-mt-s)
 	target_link_libraries(${EXECUTEABLE} boost_filesystem-mt-s)
 	target_link_libraries(${EXECUTEABLE} boost_thread_win32-mt-s)
+#	target_link_libraries(${EXECUTEABLE} ssl)
+	target_link_libraries(${EXECUTEABLE} crypt32)
 	target_link_libraries(${EXECUTEABLE} Qt5PlatformSupport)
 	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
 else ()