Merge pull request #43 from MaskRay/cmake

Raise cmake_minimum_required: 2.8 -> 3.4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71eb24ddfe4f546a685976d2ca56c3aabe68b30e..eec0993b08f57f885d04e0d3083047b99f631357 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ project(lwext4 C)
 cmake_minimum_required(VERSION 3.4)
 
 
+include_directories(include)
 include_directories(${PROJECT_BINARY_DIR}/include)
 include_directories(blockdev/filedev)
 include_directories(blockdev/filedev_win)
@@ -84,12 +85,6 @@ else()
     set_target_properties(lwext4 PROPERTIES COMPILE_FLAGS "-Wall -Wextra -pedantic")
 endif()
 
-#Config file generation
-file(
-    COPY include
-    DESTINATION .
-)
-
 #DISTRIBUTION
 set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")

diff --git a/fs_test/lwext4_server.c b/fs_test/lwext4_server.c
index 2c923baef9285e7dd15111b30a22417e3ba13d13..b65ef3de1958e4c7f305f820028fa3738fddd56d 100644 (file)
--- a/fs_test/lwext4_server.c
+++ b/fs_test/lwext4_server.c
@@ -626,7 +626,7 @@ static int file_read(const char *p)
        return rc;
 }
 
-static int file_write(const const char *p)
+static int file_write(const char *p)
 {
        int fid = MAX_FILES;
        int d;