update linux.
All checks were successful
Build Applications / PullDocker (push) Successful in 6s
Build Applications / Build (push) Successful in 1m49s
Windows CI / build (push) Successful in 3m36s

This commit is contained in:
amass 2024-11-05 20:54:28 +08:00
parent 0e1e76a3a5
commit 4f9919a931
3 changed files with 18 additions and 4 deletions

View File

@ -1,4 +1,4 @@
project(Analyser VERSION 0.3 LANGUAGES C CXX) project(Analyser VERSION 0.4 LANGUAGES C CXX)
set(APPLICATION_NAME "掌静脉测试工具") set(APPLICATION_NAME "掌静脉测试工具")
find_package(Boost REQUIRED COMPONENTS json) find_package(Boost REQUIRED COMPONENTS json)

View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.28) cmake_minimum_required(VERSION 3.28)
project(SmartLockerTools VERSION 0.3 LANGUAGES C CXX) project(SmartLockerTools VERSION 0.4 LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -12,7 +12,12 @@ if(WIN32)
add_compile_definitions( add_compile_definitions(
BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN10 BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN10
) )
if(CMAKE_BUILD_TYPE STREQUAL "Release")
set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2_msvc2022_64bit_release)
else()
set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2_msvc2022_64bit_debug) set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2_msvc2022_64bit_debug)
endif()
else() else()
execute_process( execute_process(
COMMAND sh -c "echo $HOME" COMMAND sh -c "echo $HOME"
@ -22,6 +27,7 @@ else()
set(Libraries_ROOT /opt/Libraries) set(Libraries_ROOT /opt/Libraries)
set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0) set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0)
set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include)
set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2)
endif() endif()
option(Boost_USE_STATIC_LIBS OFF) option(Boost_USE_STATIC_LIBS OFF)

View File

@ -1,7 +1,11 @@
#!/bin/bash #!/bin/bash
base_path=$(pwd) base_path=$(pwd)
build_path=${base_path}/build if [ $base_path == /home/* ]; then
build_path=${base_path}/build
else
build_path=/tmp/build
fi
qt_prefix_path="/opt/Qt/6.8.0/gcc_64" qt_prefix_path="/opt/Qt/6.8.0/gcc_64"
debug_deploy=false debug_deploy=false
@ -70,6 +74,10 @@ function build() {
fi fi
} }
function clean(){
rm -fr ${build_path}
}
function deploy() { function deploy() {
if [ -d ${build_path}/lib ]; then if [ -d ${build_path}/lib ]; then
rm -fr ${build_path}/lib rm -fr ${build_path}/lib