Merge pull request #119 from nim65s/devel

s/USE_QT4/PROJECT_USE_QT4

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

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}

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 "")

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)