kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Rolf Eike Beer 2014-04-11 18:49:03 +02:00
parent 7eacbaed4d
commit f21ac16edd
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindQt.cmake
View File

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

2
Tests/Complex/CMakeLists.txt
View File

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

2
Tests/ComplexOneConfig/CMakeLists.txt
View File

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