X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=json_gssapi%2FCMakeLists.txt;h=df15fd4f11239b7427ea6620cb4a04dd98b8d3df;hb=ed6b9911b8d439a1587f2fe43c192c75614b471c;hp=3a9eb1c1763176cff2bd7e73d23cdd02a797d4f4;hpb=43cde1dd57380a2a2795b97855ec385ccba020fd;p=gssweb.git

diff --git a/json_gssapi/CMakeLists.txt b/json_gssapi/CMakeLists.txt
index 3a9eb1c..df15fd4 100644
--- a/json_gssapi/CMakeLists.txt
+++ b/json_gssapi/CMakeLists.txt
@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 2.8)
-
+include(GenerateExportHeader)
 project(json_gssapi)
 
-include_directories(src/)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(jsongssapi SHARED 
+                       src/datamodel/GSSDisplayStatus.cpp 
                        src/datamodel/GSSName.cpp
                        src/datamodel/GSSOID.cpp
                        src/datamodel/GSSOIDSet.cpp
@@ -17,34 +18,77 @@ add_library(jsongssapi SHARED
                        src/commands/GSSCommand.cpp 
                        src/commands/GSSImportName.cpp
                        src/commands/GSSAcquireCred.cpp 
+                       src/commands/GSSDisplayName.cpp
                        src/commands/GSSPseudoRandom.cpp
                        src/commands/GSSWrap.cpp  
                        src/commands/GSSUnwrap.cpp
-                       src/util_json.cpp
+                       src/utils/util_base64.cpp
+                       src/utils/util_json.cpp
+                       src/utils/util_random.cpp
                        src/cache/GSSContextCache.cpp
                        src/cache/GSSNameCache.cpp
                        src/datamodel/GSSContext.cpp
                       )
+set_target_properties( jsongssapi
+  	PROPERTIES SOVERSION 1)
+
 
-target_link_libraries(jsongssapi gssapi_krb5 jansson crypto)
+GENERATE_EXPORT_HEADER(jsongssapi)
 
-add_executable(json_gssapi main.cpp)
-target_link_libraries(json_gssapi gssapi_krb5 jansson crypto jsongssapi)
+add_executable(json_gssapi src/main.cpp)
 
 find_package (PkgConfig)
 pkg_check_modules (GLIB2   glib-2.0)
-if (GLIB2_FOUND)
-  include_directories(${GLIB2_INCLUDE_DIRS})
-  target_link_libraries(json_gssapi ${GLIB2_LIBRARIES})
-endif(GLIB2_FOUND)
- 
 
+find_package (Jansson)
+if (JANSSON_FOUND)
+else (JANSSON_FOUND)
+  set(JANSSON_LIBRARIES jansson)
+endif (JANSSON_FOUND)
+
+# deal with gssapi / krb5
+if (WIN32)
+  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)
+endif (WIN32)
+
+# openssl / crpyto for random
+if (WIN32)
+else (WIN32)
+target_link_libraries(jsongssapi crypto)
+target_link_libraries(json_gssapi crypto)
+add_definitions(-DHAVE_OPENSSL)
+endif (WIN32)
+
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+endif ()
+
+include_directories(${KRB5_INCLUDE_DIRS} ${JANSSON_INCLUDE_DIRS})
+target_link_libraries(jsongssapi ${KRB5_LIBRARIES} ${JANSSON_LIBRARIES})
+target_link_libraries(json_gssapi jsongssapi ${KRB5_LIBRARIES} ${JANSSON_LIBRARIES})
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
-FIND_PACKAGE(CPPUNIT REQUIRED)
 
-install(TARGETS json_gssapi RUNTIME DESTINATION bin)
+find_package (CPPUNIT)
+install(TARGETS json_gssapi jsongssapi
+	RUNTIME DESTINATION bin
+	LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}
+	)
 
 add_subdirectory(src)
 
-add_subdirectory(test)
\ No newline at end of file
+add_subdirectory(test)