This commit is contained in:
jomjol
2020-09-21 22:15:11 +02:00
parent 48ec76ab38
commit b059713df5
5 changed files with 52 additions and 1 deletions

View File

@@ -1,7 +1,21 @@
# This file was automatically generated for projects
# without default 'CMakeLists.txt' file.
<<<<<<< Updated upstream
FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.*)
=======
#if(NOT CMAKE_BUILD_EARLY_EXPANSION)
#ADD_CUSTOM_COMMAND(
# OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/version.cpp
# ${CMAKE_CURRENT_SOURCE_DIR}/_version.cpp
# COMMAND ${CMAKE_COMMAND} -P
# ${CMAKE_CURRENT_SOURCE_DIR}/version.cmake)
##endif()
FILE(GLOB_RECURSE app_sources ${CMAKE_SOURCE_DIR}/src/*.* )
>>>>>>> Stashed changes
idf_component_register(SRCS ${app_sources}
INCLUDE_DIRS ".")

8
code/src/githash.cmd Normal file
View File

@@ -0,0 +1,8 @@
@echo off
FOR /F "tokens=* USEBACKQ" %%F IN (`git describe --dirty --always --tags`) DO (
SET var=%%F
)
ECHO #ifndef GITHASH_H > githash.h
ECHO #define GITHASH_H >> githash.h
ECHO const std::string kGitHash = "%var%"; >> githash.h
ECHO #endif // GITHASH_H >> githash.h

View File

@@ -5,7 +5,7 @@
#include "driver/gpio.h"
#include "sdkconfig.h"
//#include "version.h"
#include "version.h"
#include "ClassLogFile.h"
@@ -135,6 +135,9 @@ extern "C" void app_main()
std::string zw = gettimestring("%Y%m%d-%H%M%S");
printf("time %s\n", zw.c_str());
printf("libfive_git_version: %s\n", libfive_git_version());
printf("libfive_git_revision: %s\n", libfive_git_revision());
printf("libfive_git_branch: %s\n", libfive_git_branch());
Camera.InitCam();
Camera.LightOnOff(false);

23
code/src/version.h Normal file
View File

@@ -0,0 +1,23 @@
// These variables are autogenerated and compiled
// into the library by the version.cmake script
extern "C"
{
extern const char* GIT_TAG;
extern const char* GIT_REV;
extern const char* GIT_BRANCH;
}
const char* libfive_git_version(void)
{
return GIT_TAG;
}
const char* libfive_git_revision(void)
{
return GIT_REV;
}
const char* libfive_git_branch(void)
{
return GIT_BRANCH;
}