summaryrefslogtreecommitdiff
path: root/fs_test
diff options
context:
space:
mode:
authorgkostka <kostka.grzegorz@gmail.com>2014-05-20 23:41:24 +0000
committergkostka <kostka.grzegorz@gmail.com>2014-05-20 23:41:24 +0000
commit6f2630560d50340611b372d58c1f450106df5467 (patch)
treea19de50f04e51c8a86ca98d2f3cdf237e06f6ffa /fs_test
parentb6a7544b8c5b52b1d13f3b9c7c94cdabb6bf5ed1 (diff)
Build system refactoring.
Diffstat (limited to 'fs_test')
-rw-r--r--fs_test/CMakeLists.txt12
-rw-r--r--fs_test/fs_test.cmake17
-rw-r--r--fs_test/lwext4_server.c1
3 files changed, 13 insertions, 17 deletions
diff --git a/fs_test/CMakeLists.txt b/fs_test/CMakeLists.txt
new file mode 100644
index 0000000..91691c1
--- /dev/null
+++ b/fs_test/CMakeLists.txt
@@ -0,0 +1,12 @@
+#fs_test executables
+add_executable(lwext4_server lwext4_server.c)
+target_link_libraries(lwext4_server lwext4)
+target_link_libraries(lwext4_server blockdev)
+if(WIN32)
+target_link_libraries(lwext4_server ws2_32)
+endif(WIN32)
+add_executable(lwext4_client lwext4_client.c)
+target_link_libraries(lwext4_client lwext4)
+if(WIN32)
+target_link_libraries(lwext4_client ws2_32)
+endif(WIN32)
diff --git a/fs_test/fs_test.cmake b/fs_test/fs_test.cmake
deleted file mode 100644
index 8bd946b..0000000
--- a/fs_test/fs_test.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-include_directories(blockdev/filedev)
-include_directories(blockdev/filedev_win)
-
-aux_source_directory(blockdev/filedev BLOCKDEV_SRC)
-aux_source_directory(blockdev/filedev_win BLOCKDEV_SRC)
-
-
-add_executable(lwext4_server fs_test/lwext4_server.c ${BLOCKDEV_SRC})
-target_link_libraries(lwext4_server lwext4)
-if(WIN32)
-target_link_libraries(lwext4_server ws2_32)
-endif(WIN32)
-add_executable(lwext4_client fs_test/lwext4_client.c ${BLOCKDEV_SRC})
-target_link_libraries(lwext4_client lwext4)
-if(WIN32)
-target_link_libraries(lwext4_client ws2_32)
-endif(WIN32) \ No newline at end of file
diff --git a/fs_test/lwext4_server.c b/fs_test/lwext4_server.c
index 00e9196..27024ff 100644
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -35,6 +35,7 @@
#include <stdbool.h>
#include <getopt.h>
#include <time.h>
+#include <sys/time.h>
#ifdef WIN32
#include <winsock2.h>