diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index a87b2c9b25855fbf95ee14e0dee336ff7a70e6b1..7595505dc954d764e9f0c00e7721408d7d386847 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -19,7 +19,7 @@ SET(_use_qt_local_doc FALSE) SET(qt_online_doc "http://doc.qt.io") -IF(USE_QT4) +IF(PROJECT_USE_QT4) FIND_FILE(QT4_TAGFILE doc/html/qt.tags HINTS / /usr PATH_SUFFIXES share/qt4) @@ -34,7 +34,7 @@ IF(USE_QT4) SET(QT_TAGFILES "\"${QT4_TAGFILE}=${qt_doc}/archives/qt-4.8\"" PARENT_SCOPE) ENDIF(_use_qt_local_doc) ENDIF() -ELSE(USE_QT4) +ELSE(PROJECT_USE_QT4) SET(_QT_TAGFILES) # Available components # qtcore qtgui qtwidgets qtnetwork qtsql @@ -57,7 +57,7 @@ ELSE(USE_QT4) ENDIF() ENDFOREACH() SET(QT_TAGFILES ${_QT_TAGFILES} PARENT_SCOPE) -ENDIF(USE_QT4) +ENDIF(PROJECT_USE_QT4) # }}} # vim: foldmethod=marker foldlevel=0 diff --git a/doc/Makefile b/doc/Makefile index 440846dbe70b876e6b2643d5a685a9813a0efafb..61b66d2cfe8d6d23378e50c051ea5c9b6eeaab36 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -51,7 +51,7 @@ gepetto-viewer_repository=${HPP_REPO} gepetto-viewer-corba_branch=devel gepetto-viewer-corba_repository=${HPP_REPO} ifeq (${QT_VERSION}, 5) - gepetto-viewer-corba_extra_flags= -DUSE_QT4=OFF + gepetto-viewer-corba_extra_flags= -DPROJECT_USE_QT4=OFF endif pythonqt_branch=qt${QT_VERSION} diff --git a/plugins/omniorbserver/CMakeLists.txt b/plugins/omniorbserver/CMakeLists.txt index 2bfd22c127b44ddc772a3b0f46ee0b3f465441e9..5dc07189003d67e9442bcac2a9f290f4fe395320 100644 --- a/plugins/omniorbserver/CMakeLists.txt +++ b/plugins/omniorbserver/CMakeLists.txt @@ -16,7 +16,7 @@ # gepetto-viewer-corba If not, see # <http://www.gnu.org/licenses/>. -IF(USE_QT4) +IF(PROJECT_USE_QT4) SET(QT4 "QT4") ELSE() SET(QT4 "") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index df697b3f37fac4577eb7f33f67c0835ac49df92f..940da6bcff2ab376175de5665fb9e532801ac8ad 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,9 +24,9 @@ # Boost and add it to the test suite. # -IF(USE_QT4) +IF(PROJECT_USE_QT4) INCLUDE(${QT_USE_FILE}) -ENDIF(USE_QT4) +ENDIF(PROJECT_USE_QT4) ADD_DEFINITIONS(${QT_DEFINITIONS}) MACRO(ADD_TESTCASE NAME GENERATED)