From f76392f4762e51c0506c1fd1fd18c978f491debf Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周五, 12 9月 2014 03:06:54 +0800
Subject: [PATCH] windows compile

---
 CMakeLists.txt |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe14f24..01cdfd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,10 +30,17 @@
 endif(CMAKE_BUILD_TYPE)
 
 if(WIN32)
+
 	SET(PLATFORM_LIBS "")
-	if(CMAKE_CL_64)
-		SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64 /INCREMENTAL:NO" CACHE STRING "Linker flags")
-	endif(CMAKE_CL_64)
+	include(target_arch)
+	target_architecture( TARGET_ARCHITECTURE )
+	message(STATUS "architecture detected: ${TARGET_ARCHITECTURE}")
+	#force to patch an error in cmake
+	if(TARGET_ARCHITECTURE STREQUAL "x86_64")
+		SET(CMAKE_EXE_LINKER_FLAGS "/machine:X64" CACHE STRING "Linker flags" FORCE)
+		SET(CMAKE_MODULE_LINKER_FLAGS "/machine:X64" CACHE STRING "Module Linker flags" FORCE)
+		SET(CMAKE_SHARED_LINKER_FLAGS "/machine:X64" CACHE STRING "Shared Linker flags" FORCE)
+	endif()
 	SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib ) #${CMAKE_FIND_LIBRARY_SUFFIXES}
 	add_definitions("/D_CRT_SECURE_NO_WARNINGS")
 else(WIN32)

--
Gitblit v1.9.1