From: Grzegorz Kostka <kostka.grzegorz@gmail.com>
Date: Mon, 3 Dec 2018 01:33:07 +0000 (+0100)
Subject: Merge pull request #43 from MaskRay/cmake
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=e9ca4a2d382afa8efd6fe54c869904ba99ed1d76;hp=b9679f355308ea5d3848b1229077fd02c0ddc8ae;p=lwext4.git

Merge pull request #43 from MaskRay/cmake

Raise cmake_minimum_required: 2.8 -> 3.4
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71eb24d..eec0993 100644
--- 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 2c923ba..b65ef3d 100644
--- 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;