Move util_ files into utils directory, move main.cpp into src

[gssweb.git] / json_gssapi / test / CMakeLists.txt

diff --git a/json_gssapi/test/CMakeLists.txt b/json_gssapi/test/CMakeLists.txt
index 61b1f62..d17e5f7 100644 (file)
--- a/json_gssapi/test/CMakeLists.txt
+++ b/json_gssapi/test/CMakeLists.txt
@@ -1,5 +1,5 @@
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_SOURCE_DIR}/src/commands)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src/commands)
 
 find_package (PkgConfig)
 pkg_check_modules (GLIB2   glib-2.0)
@@ -7,7 +7,8 @@ if (GLIB2_FOUND)
   include_directories(${GLIB2_INCLUDE_DIRS})
 endif(GLIB2_FOUND)
   
-
+if (WIN32)
+else (WIN32)
 add_executable(test GSSExceptionTest.cpp 
                     GSSAcquireCredTest.cpp 
                     GSSGetMicTest.cpp
@@ -26,7 +27,9 @@ add_executable(test GSSExceptionTest.cpp
                     command_mocks/MockImportName.cpp
                     test_run.cpp 
                     ../src/commands/GSSInitSecContext.cpp 
-                    ../src/util_json.cpp 
+                    ../src/utils/util_base64.cpp
+                    ../src/utils/util_json.cpp 
+                    ../src/utils/util_random.cpp
                     ../src/commands/GSSImportName.cpp
                     ../src/GSSException.cpp
                     ../src/commands/GSSGetMic.cpp
@@ -36,6 +39,7 @@ add_executable(test GSSExceptionTest.cpp
                     ../src/commands/GSSWrap.cpp
                     ../src/datamodel/GSSBuffer.cpp
                     ../src/datamodel/GSSCredential.cpp
+                    ../src/datamodel/GSSDisplayStatus.cpp
                     ../src/datamodel/GSSName.cpp
                     ../src/datamodel/GSSOID.cpp
                     ../src/datamodel/GSSOIDSet.cpp
@@ -46,9 +50,11 @@ add_executable(test GSSExceptionTest.cpp
                     datamodel/GSSOIDSetTest.cpp
   )
 
-target_link_libraries(test cppunit gssapi_krb5 jansson crypto ${GLIB2_LIBRARIES})
+find_package (Threads)
 
+target_link_libraries(test cppunit gssapi_krb5 jansson crypto ${GLIB2_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
 # install(TARGETS test RUNTIME DESTINATION bin)
+endif(WIN32)
 
 add_subdirectory(datamodel)
-add_subdirectory(command_mocks)
\ No newline at end of file
+add_subdirectory(command_mocks)