about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorMarc <foxtrot@malloc.me>2022-01-28 23:45:34 +0000
committerMarc <foxtrot@malloc.me>2022-01-28 23:45:49 +0000
commit790970012fced961d5096b19b7a23f7836c0c518 (patch)
treee0bab9b63a330c4c31ec7d25e734e5423b28d0b2
parent7ee7df47db9d73bd498d29813e73ef24844deb95 (diff)
downloadlibwifi-790970012fced961d5096b19b7a23f7836c0c518.tar.gz
libwifi-790970012fced961d5096b19b7a23f7836c0c518.tar.bz2
libwifi-790970012fced961d5096b19b7a23f7836c0c518.zip
core: Use version set in CMakeLists, inside code. Bump version to 0.0.3
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/libwifi/core/core.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cb0ee76..82a2071 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -5,7 +5,8 @@ project(wifi DESCRIPTION "802.11 Parsing / Generation library" VERSION 0.1)
5execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) 5execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH)
6execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) 6execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH)
7execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) 7execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME)
8set(LIBWIFI_VERSION "0.0.2") 8set(LIBWIFI_VERSION "0.0.3")
9add_compile_definitions(LIBWIFI_VERSION="${LIBWIFI_VERSION}")
9 10
10set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") 11set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17")
11set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") 12set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
diff --git a/src/libwifi/core/core.h b/src/libwifi/core/core.h index 02e6d45..75043a6 100644 --- a/src/libwifi/core/core.h +++ b/src/libwifi/core/core.h
@@ -16,7 +16,9 @@
16#ifndef LIBWIFI_CORE_H 16#ifndef LIBWIFI_CORE_H
17#define LIBWIFI_CORE_H 17#define LIBWIFI_CORE_H
18 18
19#define LIBWIFI_VERSION "0.0.1" 19#ifndef LIBWIFI_VERSION
20#define LIBWIFI_VERSION "UNSET_VERSION"
21#endif
20 22
21/** 23/**
22 * Commonly used fixed fields 24 * Commonly used fixed fields