Skip to content

Commit 4d70443

Browse files
committed
Nope, doesn't work
1 parent 477a1a9 commit 4d70443

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ elseif ( "${PLATFORM}" MATCHES "x11" )
118118
elseif ( "${PLATFORM}" STREQUAL "imx6" )
119119
SET ( DEFAULT_FB ON )
120120
elseif ( "${PLATFORM}" STREQUAL "windows" )
121-
# Based on default qt install path and msvc2017 64bit installer component option
122-
FIRSTSUBDIR(SUBDIRQT "C:/Qt")
123-
SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${SUBDIRQT}/msvc2017_64" "G:/Programme/Qt/5.14.1/msvc2017_64" )
124121
SET ( DEFAULT_AVAHI OFF)
125122
endif()
126123

@@ -247,7 +244,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
247244
# Prefer static linking over dynamic
248245
#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
249246

250-
# enable C++11
247+
# enable C++11; MSVC doesn't have c++11 feature switch
251248
if(NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
252249
include(CheckCXXCompilerFlag)
253250
CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
@@ -270,6 +267,13 @@ endif()
270267
# MSVC options
271268
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
272269
message(STATUS "MSVC VERSION: ${MSVC_VERSION}")
270+
# Qt5 default install path with msvc2017 64bit component
271+
FIRSTSUBDIR(SUBDIRQT "C:/Qt")
272+
SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${SUBDIRQT}/msvc2017_64" "G:/Programme/Qt/5.14.1/msvc2017_64" )
273+
# Windows 10 SDK headers/libs (Install path not selectable)
274+
#SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "C:/Program Files (x86)/Windows Kits/10" )
275+
# MSVC headers/libs (Install path selectable)
276+
#SET(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "G:/Programme/Visual Studio/VC/Tools/MSVC/14.16.27023" )
273277
endif()
274278

275279
# Use GNU gold linker if available

0 commit comments

Comments
 (0)