kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-FindQt4-available-modules' 

969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
This commit is contained in:
Brad King 2013-07-24 11:02:29 -04:00 committed by CMake Topic Stage
parent a52f00e07c 969e7ee5df
commit 49e8c65b92
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Modules/FindQt4.cmake
View File

@ -886,20 +886,16 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach() endforeach()
if(Q_WS_WIN) if(Q_WS_WIN)
if (QT_QAXCONTAINER_FOUND) set(QT_MODULES ${QT_MODULES} QAxContainer)
set(QT_MODULES ${QT_MODULES} QAxContainer) # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
# Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt PATHS ${QT_HEADERS_DIR}/ActiveQt
PATHS ${QT_HEADERS_DIR}/ActiveQt NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH )
) find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt
endif() PATHS ${QT_HEADERS_DIR}/ActiveQt
if (QT_QAXSERVER_FOUND) 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
)
endif()
endif() endif()
# Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
@ -1060,8 +1056,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
if(Q_WS_WIN) if(Q_WS_WIN)
_QT4_ADJUST_LIB_VARS(qtmain) _QT4_ADJUST_LIB_VARS(qtmain)
_QT4_ADJUST_LIB_VARS(QAxServer)
if(QT_QAXSERVER_FOUND) if(QT_QAXSERVER_FOUND)
_QT4_ADJUST_LIB_VARS(QAxServer)
set_property(TARGET Qt4::QAxServer PROPERTY set_property(TARGET Qt4::QAxServer PROPERTY
INTERFACE_QT4_NO_LINK_QTMAIN ON INTERFACE_QT4_NO_LINK_QTMAIN ON
) )
@ -1069,9 +1065,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN) COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN)
endif() endif()
if(QT_QAXCONTAINER_FOUND) _QT4_ADJUST_LIB_VARS(QAxContainer)
_QT4_ADJUST_LIB_VARS(QAxContainer)
endif()
endif() endif()
# Only public dependencies are listed here. # Only public dependencies are listed here.