Changeset 130 in pacpusframework

Timestamp:

07/30/13 14:11:53 (11 years ago)

Author:

Marek Kurdej

Message:

[cmake] Update: renamed and cached variable QT5 -> PACPUS_USE_QT5.

File:

• branches/2.0-beta1/cmake/PacpusDependencies.cmake (modified) (4 diffs)

branches/2.0-beta1/cmake/PacpusDependencies.cmake

@@ -15 +15 @@
 set(PACPUS_DEPENDENCIES_LIB "")
 
-if(NOT QT5)
+set(PACPUS_USE_QT5 FALSE CACHE BOOL "Whether to use Qt5")
+if(NOT PACPUS_USE_QT5)
     find_package(Qt4)
     if(NOT QT4_FOUND)
         message(WARNING "Qt4 not found try to find Qt5")
-        set(QT5 TRUE)
+        set(PACPUS_USE_QT5 TRUE)
     endif()
 endif()
 
-if(QT5)
+if(PACPUS_USE_QT5)
 message(STATUS "Set CMake variable 'CMAKE_PREFIX_PATH' to the path like '%QT_BIN%/../lib/cmake'")
 # ========================================
@@ -62 +63 @@
     ${Qt5SerialPort_INCLUDE_DIRS}
 )
-
 set(QT_LIBRARIES
     ${Qt5Widgets_LIBRARIES}
@@ -77 +77 @@
 endif()
 
-else(QT5)
+else()
 
 # ========================================
-# All the Pacpus' modules depends from Qt4
-# However, since each module requires specific Qt's modules, they have to include their own QT_USE_FILE
+# All the Pacpus modules depend on Qt4
+# However, since each module requires specific Qt modules, they have to include their own QT_USE_FILE
 # ========================================
 find_package(Qt4 REQUIRED)
 
-endif(QT5)
+endif()
 
 # ========================================
@@ -98 +98 @@
 # ========================================
 if(PACPUS_USE_LOG)
-
     if(WIN32 AND MSVC AND IS_BUILDING_PACPUS)
         set(LOG4CXX_ROOT ${PACPUS_3RD_PARTY_DIR}/apache-log4cxx)