Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate installation directories. #424

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Separate installation directories. #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions build_config.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,16 @@ REM Currently tested combinations by Qt installation
REM 5.15.2 msvc2019
REM 6.6.1 msvc2019

if "%QTNO%"=="" (
set QTNO=5
)

if "%QTVER%"=="" (
set QTVER=5.15.2
REM set QTVER=6.6.1
if "%QTNO%"=="5" (
set QTVER=5.15.2
) else (
set QTVER=6.6.1
)
)

if "%MSVC_VER%"=="" (
Expand Down
4 changes: 2 additions & 2 deletions build_sdk_windows_qt5_MSVC.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ call build_config.bat

if '%WORKSPACE%'=='' (
if '%DLT_VIEWER_SDK_DIR%'=='' (
set DLT_VIEWER_SDK_DIR=c:\DltViewerSDK
set DLT_VIEWER_SDK_DIR=c:\DltViewerSDKQt%QTNO%
)

set SOURCE_DIR=%CD%
set BUILD_DIR=%CD%\build\release
) else (
if '%DLT_VIEWER_SDK_DIR%'=='' (
set DLT_VIEWER_SDK_DIR=%WORKSPACE%\build\dist\DltViewerSDK
set DLT_VIEWER_SDK_DIR=%WORKSPACE%\build\dist\DltViewerSDKQt%QTNO%
)

set SOURCE_DIR=%WORKSPACE%
Expand Down
4 changes: 2 additions & 2 deletions build_sdk_windows_qt5_MSVC_cmake.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ if "%WORKSPACE%"=="" (goto NO_WORKSPACE) else (goto WITH_WORKSPACE)
set DIST_DIR=%SOURCE_DIR%\build\dist

if "%DLT_VIEWER_SDK_DIR%"=="" (
set DLT_VIEWER_SDK_DIR=c:\DltViewerSDK
set DLT_VIEWER_SDK_DIR=c:\DltViewerSDKQt%QTNO%
)

goto Continue1
Expand All @@ -31,7 +31,7 @@ if "%WORKSPACE%"=="" (goto NO_WORKSPACE) else (goto WITH_WORKSPACE)
set DIST_DIR=%SOURCE_DIR%\build\dist

if "%DLT_VIEWER_SDK_DIR%"=="" (
set DLT_VIEWER_SDK_DIR=%DIST_DIR%\DltViewerSDK
set DLT_VIEWER_SDK_DIR=%DIST_DIR%\DltViewerSDKQt%QTNO%
)
:Continue1

Expand Down
Loading