Просмотр исходного кода

Replace MATCHES test on numbers with EQUAL test

The MATCHES tests were actually wrong, as "a4b" and "42" would also cause a
match when it should not.
Rolf Eike Beer 11 лет назад
Родитель
Сommit
f21ac16edd
3 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      Modules/FindQt.cmake
  2. 1 1
      Tests/Complex/CMakeLists.txt
  3. 1 1
      Tests/ComplexOneConfig/CMakeLists.txt

+ 2 - 2
Modules/FindQt.cmake

@@ -154,12 +154,12 @@ else()
   endif()
 endif()
 
-if(DESIRED_QT_VERSION MATCHES 3)
+if(DESIRED_QT_VERSION EQUAL 3)
   set(Qt3_FIND_REQUIRED ${Qt_FIND_REQUIRED})
   set(Qt3_FIND_QUIETLY  ${Qt_FIND_QUIETLY})
   include(${CMAKE_CURRENT_LIST_DIR}/FindQt3.cmake)
 endif()
-if(DESIRED_QT_VERSION MATCHES 4)
+if(DESIRED_QT_VERSION EQUAL 4)
   set(Qt4_FIND_REQUIRED ${Qt_FIND_REQUIRED})
   set(Qt4_FIND_QUIETLY  ${Qt_FIND_QUIETLY})
   include(${CMAKE_CURRENT_LIST_DIR}/FindQt4.cmake)

+ 1 - 1
Tests/Complex/CMakeLists.txt

@@ -36,7 +36,7 @@ ASSERT(Complex_BINARY_DIR "The PROJECT command is broken")
 #
 macro(TEST_ARGC value1 value2)
   add_definitions(${value1} ${value2})
-  if (${ARGC} MATCHES 4)
+  if (${ARGC} EQUAL 4)
     add_definitions(${ARGV2} ${ARGV3})
   endif ()
 endmacro()

+ 1 - 1
Tests/ComplexOneConfig/CMakeLists.txt

@@ -36,7 +36,7 @@ ASSERT(Complex_BINARY_DIR "The PROJECT command is broken")
 #
 macro(TEST_ARGC value1 value2)
   add_definitions(${value1} ${value2})
-  if (${ARGC} MATCHES 4)
+  if (${ARGC} EQUAL 4)
     add_definitions(${ARGV2} ${ARGV3})
   endif ()
 endmacro()