From 2112db0a98a2cd14b25828a5bc84bddc423712bf Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 14 May 2021 17:40:21 +0200 Subject: cmake/msvc: update to Qt6 --- sdk-paths-sthalik@MSVC-windows.cmake | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index 2f4f4ba2..ad2ddb7e 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -20,7 +20,7 @@ endfunction() set(opentrack_install-debug-info TRUE CACHE INTERNAL "" FORCE) set(opentrack_maintainer-mode TRUE CACHE INTERNAL "" FORCE) -setq(Qt5_DIR "../qt-5.12.0/lib/cmake/Qt5") +list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/../qt-msvc-6.1.0") setq(EIGEN3_INCLUDE_DIR "eigen") setq(OpenCV_DIR "opencv/build") @@ -36,10 +36,3 @@ setq(SDK_RIFT_140 "ovr_sdk_win_1.43.0/LibOVR") setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") -set(Qt5_DIR "c:/qt/qt-5.14.0/lib/cmake/Qt5" CACHE PATH "" FORCE) -set(Qt5Core_DIR "${Qt5_DIR}Core" CACHE PATH "" FORCE) -set(Qt5Gui_DIR "${Qt5_DIR}Gui" CACHE PATH "" FORCE) - -if(CMAKE_GENERATOR STREQUAL "NMake Makefiles") - set(CMAKE_MAKE_PROGRAM "jom" CACHE STRING "" FORCE) -endif() -- cgit v1.2.3