From 790970012fced961d5096b19b7a23f7836c0c518 Mon Sep 17 00:00:00 2001 From: Marc Date: Fri, 28 Jan 2022 23:45:34 +0000 Subject: core: Use version set in CMakeLists, inside code. Bump version to 0.0.3 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') 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) execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITBRANCH) execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) -set(LIBWIFI_VERSION "0.0.2") +set(LIBWIFI_VERSION "0.0.3") +add_compile_definitions(LIBWIFI_VERSION="${LIBWIFI_VERSION}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") -- cgit 1.4.1 From 762f2698e2fa30d4c4d3f5b3dca2ff60d564783d Mon Sep 17 00:00:00 2001 From: Marc Date: Fri, 28 Jan 2022 23:57:06 +0000 Subject: misc: Build Git branch and hash into .so in Debug mode --- CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 82a2071..aa87f3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ execute_process(COMMAND git rev-parse --abbrev-ref HEAD OUTPUT_STRIP_TRAILING_WH execute_process(COMMAND git log -1 --pretty=format:%h OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE GITHASH) execute_process(COMMAND date OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE BUILDTIME) set(LIBWIFI_VERSION "0.0.3") -add_compile_definitions(LIBWIFI_VERSION="${LIBWIFI_VERSION}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu17") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") @@ -25,6 +24,16 @@ message("-----------------------------------") message("802.11 Parsing / Generation Library") message("Version: ${LIBWIFI_VERSION}, Git: ${GITBRANCH} (${GITHASH}), Time: ${BUILDTIME}") message("Compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}") + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + message("Building for Debug") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0") + add_compile_definitions(LIBWIFI_VERSION="dev-${GITBRANCH}-${GITHASH}") +else() + message("Building for Release") + add_compile_definitions(LIBWIFI_VERSION="${LIBWIFI_VERSION}") +endif(CMAKE_BUILD_TYPE STREQUAL "Debug") + message(" ") file(GLOB_RECURSE libwifi_src @@ -32,11 +41,6 @@ file(GLOB_RECURSE libwifi_src "src/libwifi/*.c" ) -if (CMAKE_BUILD_TYPE STREQUAL "Debug") - message("Building as Debug") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ggdb -O0") -endif(CMAKE_BUILD_TYPE STREQUAL "Debug") - add_library(wifi SHARED ${libwifi_src}) set_target_properties(wifi PROPERTIES LINKER_LANGUAGE C) -- cgit 1.4.1