makefile: add version definitions to makefile & CMakeLists

[lwext4.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 95380db190df1f49e1a0b09dd10fbe16104a4b4a..33bdb234e77c64aadcddfe64dedd0ab92a861583 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,37 +8,33 @@ include_directories(blockdev/filedev_win)
 
 set(BLOCKDEV_TYPE  none)
 
+add_definitions(-DVERSION="${VERSION}")
+
 #Examples
 if    (CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m0)
     #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m3)
     #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  arm-sim)
-    add_subdirectory(blockdev)
-    add_subdirectory(demos/generic)
+    #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  cortex-m4)
     #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  bf518)
-    add_definitions(-DCONFIG_HAVE_OWN_OFLAGS=1)
     #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  avrxmega7)
-    add_definitions(-DCONFIG_HAVE_OWN_OFLAGS=1)
     #...
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL  msp430g2210)
     add_definitions(-DCONFIG_DEBUG_PRINTF=0)
     add_definitions(-DCONFIG_DEBUG_ASSERT=0)
-    add_definitions(-DCONFIG_HAVE_OWN_OFLAGS=1)
     #...
 else()
     #Generic example target
     set(BLOCKDEV_TYPE  linux)
-    add_definitions(-DCONFIG_EXTENT_FULL=1)
     add_definitions(-DCONFIG_HAVE_OWN_OFLAGS=0)
     add_definitions(-DCONFIG_HAVE_OWN_ERRNO=0)
     add_definitions(-DCONFIG_HAVE_OWN_ASSERT=0)
     add_definitions(-DCONFIG_BLOCK_DEV_CACHE_SIZE=16)
     add_subdirectory(fs_test)
-    add_subdirectory(demos/generic)
 endif()
 
 add_subdirectory(blockdev)
@@ -50,9 +46,9 @@ set_target_properties(lwext4 PROPERTIES COMPILE_FLAGS "-Wall -Wextra -pedantic")
 
 
 #DISTRIBUTION
-set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 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}")
@@ -60,4 +56,5 @@ set(CPACK_SOURCE_IGNORE_FILES
 "/build" ".git")
 include(CPack)
 
+
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)