diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-10-29 08:48:35 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-10-29 08:25:58 +0000 |
| commit | 698733a531c3d85056e74d4a3f3ae1f671bd229d (patch) | |
| tree | d81df602ee63af9450403dd31b3b8a52095d1d61 | |
| parent | d4245b429796761a259d96e9f6f00d580be1d893 (diff) | |
cmake: use newer Qt in my dev paths
| -rw-r--r-- | sdk-paths-sthalik@MSVC-windows.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index 252431a6..17ea107c 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.10.0/lib/cmake/Qt5") +setq(Qt5_DIR "../qt-5.11.2/lib/cmake/Qt5") setq(OpenCV_DIR "opencv/build") setq(SDK_ARUCO_LIBPATH "aruco/build/src/aruco.lib") @@ -35,3 +35,7 @@ setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") setq(SDK_REALSENSE "RSSDK-R2") + +if(CMAKE_GENERATOR STREQUAL "NMake Makefiles") + set(CMAKE_MAKE_PROGRAM "jom" CACHE STRING "" FORCE) +endif() |