Merge remote-tracking branch 'upstream/master'

[lwext4.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf75900f9fd50c4cb3e56fc6cbf7e88698d71a1e..1ae2c5ba34aa1d563e3a5af576dc8d21ca57cede 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ include_directories(lwext4)
 include_directories(blockdev/filedev)\r
 include_directories(blockdev/filedev_win)\r
 \r
+set(BLOCKDEV_TYPE  none)\r
 \r
 #Examples\r
 if    (CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m0)\r
@@ -34,11 +35,13 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  msp430g2210)
     #...\r
 else()\r
     #Generic example target\r
-    add_subdirectory(blockdev)\r
+    set(BLOCKDEV_TYPE  linux)\r
     add_subdirectory(fs_test)\r
     add_subdirectory(demos/generic)\r
 endif()\r
 \r
+add_subdirectory(blockdev)\r
+\r
 #Library build\r
 add_subdirectory(lwext4)\r
 #Detect all possible warnings for lwext4 target\r
@@ -47,7 +50,7 @@ set_target_properties(lwext4 PROPERTIES COMPILE_FLAGS "-Wall -Wextra -pedantic")
 \r
 #DISTRIBUTION\r
 set(CPACK_PACKAGE_VERSION_MAJOR "0")\r
-set(CPACK_PACKAGE_VERSION_MINOR "7")\r
+set(CPACK_PACKAGE_VERSION_MINOR "8")\r
 set(CPACK_PACKAGE_VERSION_PATCH "0")\r
 set(CPACK_SOURCE_GENERATOR "TBZ2")\r
 set(CPACK_SOURCE_PACKAGE_FILE_NAME\r