Skip to content

Commit 235441a

Browse files
committed
Update dependency paths for new artifacts.
1 parent 01ab3ad commit 235441a

2 files changed

Lines changed: 6 additions & 16 deletions

File tree

view/kernelcache/CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@ if(NOT BN_INTERNAL_BUILD)
1313
endif()
1414

1515
if (NOT BN_INTERNAL_BUILD)
16-
if(WIN32)
17-
set(MSVC_VERSION msvc2022_64 CACHE STRING "Version of MSVC Qt is built with" )
18-
endif()
1916
set(QT_VERSION 6.7.2 CACHE STRING "Version of Qt to use")
2017

2118
if(NOT CMAKE_PREFIX_PATH)
22-
if(APPLE)
23-
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/clang_64/lib/cmake)
24-
elseif(WIN32)
25-
set(CMAKE_PREFIX_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH}/Qt/${QT_VERSION}/${MSVC_VERSION}/lib/cmake)
19+
if(WIN32)
20+
set(CMAKE_PREFIX_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH}/Qt/${QT_VERSION}/lib/cmake)
2621
else()
27-
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/gcc_64/lib/cmake)
22+
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/lib/cmake)
2823
endif()
2924
endif()
3025
message("CMAKE_PREFIX_PATH is: ${CMAKE_PREFIX_PATH}")

view/sharedcache/CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,13 @@ if(NOT BN_INTERNAL_BUILD)
1313
endif()
1414

1515
if (NOT BN_INTERNAL_BUILD)
16-
if(WIN32)
17-
set(MSVC_VERSION msvc2022_64 CACHE STRING "Version of MSVC Qt is built with" )
18-
endif()
1916
set(QT_VERSION 6.10.1 CACHE STRING "Version of Qt to use")
2017

2118
if(NOT CMAKE_PREFIX_PATH)
22-
if(APPLE)
23-
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/clang_64/lib/cmake)
24-
elseif(WIN32)
25-
set(CMAKE_PREFIX_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH}/Qt/${QT_VERSION}/${MSVC_VERSION}/lib/cmake)
19+
if(WIN32)
20+
set(CMAKE_PREFIX_PATH $ENV{HOMEDRIVE}$ENV{HOMEPATH}/Qt/${QT_VERSION}/lib/cmake)
2621
else()
27-
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/gcc_64/lib/cmake)
22+
set(CMAKE_PREFIX_PATH $ENV{HOME}/Qt/${QT_VERSION}/lib/cmake)
2823
endif()
2924
endif()
3025
message("CMAKE_PREFIX_PATH is: ${CMAKE_PREFIX_PATH}")

0 commit comments

Comments
 (0)