You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
1.9 KiB
55 lines
1.9 KiB
diff -Nrup a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake |
|
--- a/Modules/FindQt4.cmake 2014-01-16 12:15:08.000000000 -0500 |
|
+++ b/Modules/FindQt4.cmake 2016-02-29 18:39:54.384628635 -0500 |
|
@@ -886,16 +886,20 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
|
endforeach() |
|
|
|
if(Q_WS_WIN) |
|
- set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer) |
|
- # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR |
|
- find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt |
|
- PATHS ${QT_HEADERS_DIR}/ActiveQt |
|
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
|
- ) |
|
- find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt |
|
- PATHS ${QT_HEADERS_DIR}/ActiveQt |
|
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
|
- ) |
|
+ if (QT_QAXCONTAINER_FOUND) |
|
+ set(QT_MODULES ${QT_MODULES} QAxContainer) |
|
+ # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR |
|
+ find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt |
|
+ PATHS ${QT_HEADERS_DIR}/ActiveQt |
|
+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
|
+ ) |
|
+ endif() |
|
+ if (QT_QAXSERVER_FOUND) |
|
+ find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt |
|
+ PATHS ${QT_HEADERS_DIR}/ActiveQt |
|
+ NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH |
|
+ ) |
|
+ endif() |
|
endif() |
|
|
|
# Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR |
|
@@ -1057,8 +1061,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
|
if(Q_WS_WIN) |
|
_QT4_ADJUST_LIB_VARS(qtmain) |
|
|
|
- _QT4_ADJUST_LIB_VARS(QAxServer) |
|
if(QT_QAXSERVER_FOUND) |
|
+ _QT4_ADJUST_LIB_VARS(QAxServer) |
|
set_property(TARGET Qt4::QAxServer PROPERTY |
|
INTERFACE_QT4_NO_LINK_QTMAIN ON |
|
) |
|
@@ -1066,7 +1070,9 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) |
|
COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN) |
|
endif() |
|
|
|
- _QT4_ADJUST_LIB_VARS(QAxContainer) |
|
+ if(QT_QAXCONTAINER_FOUND) |
|
+ _QT4_ADJUST_LIB_VARS(QAxContainer) |
|
+ endif() |
|
endif() |
|
|
|
# Only public dependencies are listed here.
|
|
|