Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the submodule trantor

This commit is contained in:
antao 2019-01-19 13:50:35 +08:00
parent 5fd8571292
commit c26f536255
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
get_version.sh
View File

@ -3,7 +3,7 @@
GIT_VER=$(git log|grep ^commit|wc -l|sed -e "s/^ *//")
MD5=$(git log|head -1|awk '{printf $2}')
TMP_FILE=/tmp/version
echo "#define VERSION \"0.9.16.$GIT_VER\"" > ${TMP_FILE}
echo "#define VERSION \"0.9.17.$GIT_VER\"" > ${TMP_FILE}
echo "#define VERSION_MD5 \"$MD5\"" >> ${TMP_FILE}
if [ ! -f $1 ];then
mv -f ${TMP_FILE} $1

2
orm_lib/src/mysql_impl/test/CMakeLists.txt
View File

@ -1,4 +1,4 @@
link_libraries(drogon trantor pthread dl)
add_executable(mytest1 test1.cc)
add_executable(mysql_test1 test1.cc)
#add_executable(test2 test2.cc)

4
orm_lib/src/postgresql_impl/test/CMakeLists.txt
View File

@ -1,4 +1,4 @@
link_libraries(drogon trantor pthread dl)
add_executable(test1 test1.cc)
add_executable(test2 test2.cc)
add_executable(pg_test1 test1.cc)
add_executable(pg_test2 test2.cc)

2
trantor

@ -1 +1 @@
Subproject commit f18818dea97d2ee8e7f60a10d2f289b9cecbd6e6
Subproject commit 4ba9e71d070b6c6498b4f0c9fd8e66bdde97ed97