amass/SmartLockerTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

adapt path.
Some checks failed
Windows CI / build (push) Failing after 2m41s
Details

Browse Source
This commit is contained in:
amass 2024-10-02 15:41:57 +08:00
parent 20fe4de46c
commit edfc2a4e82
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -6,8 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
if(WIN32) if(WIN32)
set(Projects_ROOT E:/Projects) set(Libraries_ROOT E:/Projects/Libraries CACHE STRING "Libraries directory.")
set(Libraries_ROOT ${Projects_ROOT}/Libraries)
set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0_msvc2022_64bit) set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0_msvc2022_64bit)
set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_86) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_86)
add_compile_definitions( add_compile_definitions(
@ -19,7 +18,6 @@ else()
OUTPUT_VARIABLE USER_HOME OUTPUT_VARIABLE USER_HOME
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE
) )
set(Projects_ROOT ${USER_HOME}/Projects)
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)

12
resources/build.ps1
View File

@ -6,8 +6,11 @@ if (!(Test-Path $MsvcScript)) { $MsvcScript = 'D:\Program Files\Microsoft Visual
$qtHome = "D:\Qt\6.7.3\msvc2019_64" $qtHome = "D:\Qt\6.7.3\msvc2019_64"
$openSSLRoot = "D:\Qt\Tools\OpenSSLv3\Win_x64" $openSSLRoot = "D:\Qt\Tools\OpenSSLv3\Win_x64"
$boostRoot = "E:\Projects\Libraries\boost_1_86_0_msvc2022_64bit"
$ffmpegRoot = "E:\Projects\Libraries\ffmpeg-7.0.2-full_build-shared" $librariesPath = "E:\Projects\Libraries"
if (!(Test-Path $librariesPath)) { $librariesPath = "D:\Projects\Libraries" }
$boostRoot = "$librariesPath\boost_1_86_0_msvc2022_64bit"
$ffmpegRoot = "$librariesPath\ffmpeg-7.0.2-full_build-shared"
$projectPath = Get-Location $projectPath = Get-Location
$buildPath = Join-Path -Path $projectPath -ChildPath "build" $buildPath = Join-Path -Path $projectPath -ChildPath "build"
@ -22,7 +25,8 @@ function Build() {
-DQT_DIR="$qtHome\lib\cmake\Qt6" ` -DQT_DIR="$qtHome\lib\cmake\Qt6" `
-DQt6_DIR="$qtHome\lib\cmake\Qt6" ` -DQt6_DIR="$qtHome\lib\cmake\Qt6" `
-DQt6CoreTools_DIR="$qtHome\lib\cmake\Qt6CoreTools" ` -DQt6CoreTools_DIR="$qtHome\lib\cmake\Qt6CoreTools" `
-DQt6QmlTools_DIR="$qtHome\lib\cmake\Qt6QmlTools" -DQt6QmlTools_DIR="$qtHome\lib\cmake\Qt6QmlTools" `
-DLibraries_ROOT="$librariesPath"
} }
cmake.exe --build $buildPath --target all cmake.exe --build $buildPath --target all
@ -47,7 +51,7 @@ function Deploy() {
} }
New-Item $deployPath\qml\QtCore -ItemType Directory New-Item $deployPath\qml\QtCore -ItemType Directory
$plugins = "qtqmlcoreplugin.dll","qmldir","plugins.qmltypes" $plugins = "qtqmlcoreplugin.dll", "qmldir", "plugins.qmltypes"
foreach ($plugin in $plugins) { foreach ($plugin in $plugins) {
Copy-Item -Path $QtHome\qml\QtCore\$plugin -Destination $deployPath\qml\QtCore Copy-Item -Path $QtHome\qml\QtCore\$plugin -Destination $deployPath\qml\QtCore
} }