diff --git a/CMakeLists.txt b/CMakeLists.txt index 91020d0..a373e66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(WIN32) - set(Projects_ROOT E:/Projects) - set(Libraries_ROOT ${Projects_ROOT}/Libraries) + set(Libraries_ROOT E:/Projects/Libraries CACHE STRING "Libraries directory.") set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0_msvc2022_64bit) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_86) add_compile_definitions( @@ -19,7 +18,6 @@ else() OUTPUT_VARIABLE USER_HOME OUTPUT_STRIP_TRAILING_WHITESPACE ) - set(Projects_ROOT ${USER_HOME}/Projects) set(Libraries_ROOT /opt/Libraries) set(BOOST_ROOT ${Libraries_ROOT}/boost_1_86_0) set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include) diff --git a/resources/build.ps1 b/resources/build.ps1 index 090335d..b324cae 100644 --- a/resources/build.ps1 +++ b/resources/build.ps1 @@ -6,8 +6,11 @@ if (!(Test-Path $MsvcScript)) { $MsvcScript = 'D:\Program Files\Microsoft Visual $qtHome = "D:\Qt\6.7.3\msvc2019_64" $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 $buildPath = Join-Path -Path $projectPath -ChildPath "build" @@ -22,7 +25,8 @@ function Build() { -DQT_DIR="$qtHome\lib\cmake\Qt6" ` -DQt6_DIR="$qtHome\lib\cmake\Qt6" ` -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 @@ -47,7 +51,7 @@ function Deploy() { } New-Item $deployPath\qml\QtCore -ItemType Directory - $plugins = "qtqmlcoreplugin.dll","qmldir","plugins.qmltypes" + $plugins = "qtqmlcoreplugin.dll", "qmldir", "plugins.qmltypes" foreach ($plugin in $plugins) { Copy-Item -Path $QtHome\qml\QtCore\$plugin -Destination $deployPath\qml\QtCore }