X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=bf75900f9fd50c4cb3e56fc6cbf7e88698d71a1e;hb=ac6fcab1c1a68360b188db76c3f6674e2adee3d7;hp=9fb297ef30735e348cb29988a6bd259ee81b6c87;hpb=c109281525bd972c75050db10980fe42ffdc80b7;p=lwext4.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fb297e..bf75900 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,49 +2,58 @@ project(lwext4 C)
 cmake_minimum_required(VERSION 2.8)
 
 
-#LIBRARY
-include_directories(. lwext4)
-aux_source_directory(lwext4 LWEXT4_SRC)
-add_library(lwext4  ${LWEXT4_SRC})
-
+include_directories(lwext4)
+include_directories(blockdev/filedev)
+include_directories(blockdev/filedev_win)
 
-#EXECUTABLE
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m3)
-#Library size print
-add_custom_target(size ALL DEPENDS lwext4 COMMAND ${SIZE} -B liblwext4.a)
+#Examples
+if    (CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m0)
+    #cortex-m0 demos
+    #...
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m3)
+    #cortex-m3 demos
 
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  arm-sim)
+    #arm-sim demos
+    add_subdirectory(blockdev)
+    add_subdirectory(demos/generic)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m4)
-#Library size print
-add_custom_target(size ALL DEPENDS lwext4 COMMAND ${SIZE} -B liblwext4.a)
-
+    #cortex-m4 demos
+    add_subdirectory(demos/stm32f429_disco)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  bf518)
-#Library size print
-add_custom_target(size ALL DEPENDS lwext4 COMMAND ${SIZE} -B liblwext4.a)
-
+    #bf518 demos
+    #...
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  avrxmega7)
+    #avrxmega7 demos
+    #...
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  msp430g2210)
+    add_definitions(-DCONFIG_DEBUG_PRINTF=0)
+    add_definitions(-DCONFIG_DEBUG_ASSERT=0)
+    #msp430f6459 demos
+    #...
 else()
-#Generic example target
-include_directories(blockdev/filedev)
-include_directories(blockdev/io_raw)
+    #Generic example target
+    add_subdirectory(blockdev)
+    add_subdirectory(fs_test)
+    add_subdirectory(demos/generic)
+endif()
 
-aux_source_directory(blockdev/filedev FILEDEV_SRC)
-aux_source_directory(blockdev/io_raw IORAW_SRC)
-aux_source_directory(demos/generic GENERIC_SRC)
+#Library build
+add_subdirectory(lwext4)
+#Detect all possible warnings for lwext4 target
+set_target_properties(lwext4 PROPERTIES COMPILE_FLAGS "-Wall -Wextra -pedantic")
 
-add_executable(fileimage_demo ${GENERIC_SRC} ${FILEDEV_SRC} ${IORAW_SRC})
-target_link_libraries(fileimage_demo lwext4)
-add_custom_target(size ALL DEPENDS lwext4 COMMAND size -B liblwext4.a)
-endif()
 
 #DISTRIBUTION
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "1")
+set(CPACK_PACKAGE_VERSION_MINOR "7")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_SOURCE_GENERATOR "TBZ2")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME
   "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_SOURCE_IGNORE_FILES
-"/build")
+"/build" ".svn")
 include(CPack)
 
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)