ENH: Use FIND_PACKAGE instead of INCLUDE(Find...
This commit is contained in:
parent
685a8ed86f
commit
0e67feb17a
@ -205,7 +205,7 @@ IF(QT_FOUND)
|
|||||||
SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
|
SET (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
|
||||||
# for unix add X11 stuff
|
# for unix add X11 stuff
|
||||||
IF(UNIX)
|
IF(UNIX)
|
||||||
INCLUDE(FindX11)
|
FIND_PACKAGE(X11)
|
||||||
IF (X11_FOUND)
|
IF (X11_FOUND)
|
||||||
SET (QT_LIBRARIES ${QT_LIBRARIES} ${X11_LIBRARIES})
|
SET (QT_LIBRARIES ${QT_LIBRARIES} ${X11_LIBRARIES})
|
||||||
ENDIF (X11_FOUND)
|
ENDIF (X11_FOUND)
|
||||||
@ -214,7 +214,7 @@ IF(QT_FOUND)
|
|||||||
ENDIF (CMAKE_DL_LIBS)
|
ENDIF (CMAKE_DL_LIBS)
|
||||||
ENDIF(UNIX)
|
ENDIF(UNIX)
|
||||||
IF(QT_QT_LIBRARY MATCHES "qt-mt")
|
IF(QT_QT_LIBRARY MATCHES "qt-mt")
|
||||||
INCLUDE(FindThreads)
|
FIND_PACKAGE(Threads)
|
||||||
SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
SET(QT_LIBRARIES ${QT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||||
ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
|
ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
|
||||||
ENDIF(QT_FOUND)
|
ENDIF(QT_FOUND)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user