From: Diane Trout Date: Thu, 27 Jul 2006 01:20:33 +0000 (+0000) Subject: use QT_QTASSISTANT_FOUND when detecting QtAssistant X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=mussa.git;a=commitdiff_plain;h=52b6e525865a72c8b67ca004b9aa28f40ccf9e76 use QT_QTASSISTANT_FOUND when detecting QtAssistant --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7474cec..04e576f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ SET(USE_PYTHON 1) # include packages we depend on FIND_PACKAGE(Qt4) SET(QT_USE_QTOPENGL 1) -IF(QT_ASSISTANT_LIB) +IF(QT_QTASSISTANT_FOUND) SET(QT_USE_QTNETWORK 1) SET(QT_USE_QTASSISTANT 1) -ENDIF(QT_ASSISTANT_LIB) +ENDIF(QT_QTASSISTANT_FOUND) INCLUDE( ${QT_USE_FILE} ) FIND_PACKAGE(OpenGL) FIND_PACKAGE(Boost) diff --git a/qui/CMakeLists.txt b/qui/CMakeLists.txt index dfdba48..de10ec3 100644 --- a/qui/CMakeLists.txt +++ b/qui/CMakeLists.txt @@ -4,10 +4,10 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 ) FIND_PACKAGE(Qt4) SET(QT_USE_QTOPENGL 1) -IF(QT_ASSISTANT_LIB) +IF(QT_QTASSISTANT_FOUND) SET(QT_USE_QTNETWORK 1) SET(QT_USE_QTASSISTANT 1) -ENDIF(QT_ASSISTANT_LIB) +ENDIF(QT_QTASSISTANT_FOUND) INCLUDE( ${QT_USE_FILE} ) FIND_PACKAGE(OpenGL) FIND_PACKAGE(Boost) diff --git a/qui/test/CMakeLists.txt b/qui/test/CMakeLists.txt index eaa68a9..3765a45 100644 --- a/qui/test/CMakeLists.txt +++ b/qui/test/CMakeLists.txt @@ -4,10 +4,10 @@ FIND_PROGRAM(QT_MOC_EXECUTABLE moc-qt4 ) FIND_PACKAGE(Qt4) SET(QT_USE_QTOPENGL 1) -IF(QT_ASSISTANT_LIB) +IF(QT_QTASSISTANT_FOUND) SET(QT_USE_QTNETWORK 1) SET(QT_USE_QTASSISTANT 1) -ENDIF(QT_ASSISTANT_LIB) +ENDIF(QT_QTASSISTANT_FOUND) INCLUDE( ${QT_USE_FILE} ) FIND_PACKAGE(OpenGL) FIND_PACKAGE(Boost)