From: Kevin Wasserman <krwasserman@hotmail.com>
Date: Thu, 8 Jan 2015 21:57:40 +0000 (-0500)
Subject: Support both x86 and x64 targets on Windows
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=gssweb.git;a=commitdiff_plain;h=304ec4e3a1caf3094911be69f890bd6fd96ced1d

Support both x86 and x64 targets on Windows
---

diff --git a/json_gssapi/CMakeLists.txt b/json_gssapi/CMakeLists.txt
index ac6b264..ec12cbd 100644
--- a/json_gssapi/CMakeLists.txt
+++ b/json_gssapi/CMakeLists.txt
@@ -45,12 +45,19 @@ endif (JANSSON_FOUND)
 
 # deal with gssapi / krb5
 if (WIN32)
-set(KRB5_SDK $ENV{PROGRAMW6432}\\MIT\\Kerberos)
-message("KRB5_SDK: ${KRB5_SDK}" )
-set(KRB5_INCLUDE_DIRS ${KRB5_SDK}\\include;${KRB5_SDK}\\include\\gssapi)
-set(KRB5_LIBRARIES ${KRB5_SDK}\\lib\\amd64\\gssapi64.lib)
+  if ("$ENV{TARGET_CPU}" STREQUAL "x86")
+    set(KRB5_SDK $ENV{ProgramFiles}\\MIT\\Kerberos)
+    set(GSSAPI_LIB ${KRB5_SDK}\\lib\\i386\\gssapi32.lib)
+  elseif ("$ENV{TARGET_CPU}" STREQUAL "x64")
+    set(KRB5_SDK $ENV{PROGRAMW6432}\\MIT\\Kerberos)
+    set(GSSAPI_LIB ${KRB5_SDK}\\lib\\amd64\\gssapi64.lib)
+  else ("$ENV{TARGET_CPU}" STREQUAL "x86")
+    message(FATAL_ERROR "TARGET_CPU '$ENV{TARGET_CPU}' not supported. Did you run setenv.bat?")
+  endif ("$ENV{TARGET_CPU}" STREQUAL "x86")
+  set(KRB5_INCLUDE_DIRS ${KRB5_SDK}\\include;${KRB5_SDK}\\include\\gssapi)
+  set(KRB5_LIBRARIES ${GSSAPI_LIB})
 else (WIN32)
-set(KRB5_LIBRARIES gssapi_krb5)
+  set(KRB5_LIBRARIES gssapi_krb5)
 endif (WIN32)
 
 # openssl / crpyto for random