1 files changed, 18 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c6da06..de696bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ option(WITH_IPv6 "Enable IPv6 Support" ON)
 option(WITH_WEBSOCKETS "Build with websockets support" ON)
 
 
+
 if(WITH_ZLIB)
   find_package(ZLIB)
 endif(WITH_ZLIB)
@@ -500,9 +501,11 @@ foreach(e ${LIBVNCCLIENT_EXAMPLES})
   target_link_libraries(client_examples_${e} vncclient ${CMAKE_THREAD_LIBS_INIT} ${SDL_LIBRARY} ${FFMPEG_LIBRARIES})
 endforeach(e ${LIBVNCCLIENT_EXAMPLES})
 
+
 #
 # them tests
 #
+
 if(UNIX)
     set(ADDITIONAL_TEST_LIBS m)
 endif(UNIX)
@@ -510,41 +513,18 @@ endif(UNIX)
 set(SIMPLETESTS
    cargstest
    copyrecttest
-   wstest
 )
 
-add_test(NAME cargs COMMAND test_cargstest)
-add_test(NAME websockets_decode COMMAND test_wstest)
-
-if(CMAKE_USE_PTHREADS_INI)
-  list(APPEND SIMPLETESTS encodingstest)
-endif(CMAKE_USE_PTHREADS_INI)
-
-if(FOUND_LIBJPEG_TURBO)
-  list(APPEND SIMPLETESTS tjunittest tjbench)
-  set(tjunittest_add_src 
-      ${TESTS_DIR}/tjutil.c
-      ${TESTS_DIR}/tjutil.h
-      ${COMMON_DIR}/turbojpeg.c
-      ${COMMON_DIR}/turbojpeg.h
+if(CMAKE_USE_PTHREADS_INIT)
+  set(SIMPLETESTS
+      ${SIMPLETESTS}
+      encodingstest
      )
-
- set(tjbench_add_src
-     ${TESTS_DIR}/tjbench.c
-     ${TESTS_DIR}/tjutil.c
-     ${TESTS_DIR}/tjutil.h
-     ${TESTS_DIR}/bmp.c
-     ${TESTS_DIR}/bmp.h
-     ${COMMON_DIR}/turbojpeg.c
-     ${COMMON_DIR}/turbojpeg.h
-    )
-
-  add_test(NAME turbojpeg COMMAND test_tjunittest)
-endif(FOUND_LIBJPEG_TURBO)
+endif(CMAKE_USE_PTHREADS_INIT)
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
 foreach(t ${SIMPLETESTS})
-  add_executable(test_${t} ${TESTS_DIR}/${t}.c ${${t}_add_src})
+  add_executable(test_${t} ${TESTS_DIR}/${t}.c)
   set_target_properties(test_${t} PROPERTIES OUTPUT_NAME ${t})
   set_target_properties(test_${t} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
   target_link_libraries(test_${t} vncserver vncclient ${ADDITIONAL_TEST_LIBS})
@@ -577,10 +557,19 @@ if(WITH_JPEG AND FOUND_LIBJPEG_TURBO)
 
 endif(WITH_JPEG AND FOUND_LIBJPEG_TURBO)
 
+add_executable(test_wstest
+               ${TESTS_DIR}/wstest.c
+               ${TESTS_DIR}/wstestdata.inc
+              )
+set_target_properties(test_wstest PROPERTIES OUTPUT_NAME wstest)
+set_target_properties(test_wstest PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/test)
+target_link_libraries(test_wstest vncserver vncclient ${ADDITIONAL_TEST_LIBS})
+
 add_test(NAME cargs COMMAND test_cargstest)
 if(FOUND_LIBJPEG_TURBO)
     add_test(NAME turbojpeg COMMAND test_tjunittest)
 endif(FOUND_LIBJPEG_TURBO)
+add_test(NAME wstest COMMAND test_wstest)
 
 #
 # this gets the libraries needed by TARGET in "-libx -liby ..." form