diff options
Diffstat (limited to 'Tests/FindPackageTest')
15 files changed, 56 insertions, 56 deletions
diff --git a/Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake b/Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake index 61db416..979bbdf 100644 --- a/Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake +++ b/Tests/FindPackageTest/Baz 1.1/BazConfigVersion.cmake @@ -3,6 +3,6 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) + endif() +endif() diff --git a/Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake b/Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake index e0042d5..17caaa7 100644 --- a/Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake +++ b/Tests/FindPackageTest/Baz 1.2/CMake/BazConfigVersion.cmake @@ -3,6 +3,6 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 2) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 2) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) + endif() +endif() diff --git a/Tests/FindPackageTest/CMakeLists.txt b/Tests/FindPackageTest/CMakeLists.txt index d344649..bca149b 100644 --- a/Tests/FindPackageTest/CMakeLists.txt +++ b/Tests/FindPackageTest/CMakeLists.txt @@ -30,7 +30,7 @@ find_path(FOO_DIR foo.h) if(NOT FOO_DIR) message(FATAL_ERROR "Did not find foo.h which is in ${CMAKE_CURRENT_SOURCE_DIR}/include CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}") -endif(NOT FOO_DIR) +endif() find_package(VersionTestA 1) find_package(VersionTestB 1.2) @@ -93,7 +93,7 @@ set(PACKAGES ) foreach(p ${PACKAGES}) set(${p}_DIR "" CACHE FILEPATH "Wipe out find results for testing." FORCE) -endforeach(p) +endforeach() # Enable framework and bundle searching. Make sure bundles are found # before unix-syle packages. @@ -238,58 +238,58 @@ foreach(p ${PACKAGES}) # Debugging output. if(CMAKE_FIND_DEBUG_MODE) message("Package ${p} found [${REL_${p}_CONFIG}]") - endif(CMAKE_FIND_DEBUG_MODE) + endif() # Check and report failure. if(NOT "${REL_${p}_CONFIG}" STREQUAL "${${p}_EXPECTED}") message(SEND_ERROR "Package ${p} should have been [${${p}_EXPECTED}] but " "was [${REL_${p}_CONFIG}]") - endif(NOT "${REL_${p}_CONFIG}" STREQUAL "${${p}_EXPECTED}") + endif() else() message(SEND_ERROR "Package ${p} not found!") endif() -endforeach(p) +endforeach() # Check that version information was extracted. if(NOT "${VersionedA_VERSION}" STREQUAL "2.0") message(SEND_ERROR "Package VersionedA is version [${VersionedA_VERSION}], not [2.0]") -endif(NOT "${VersionedA_VERSION}" STREQUAL "2.0") +endif() if(NOT "${VersionedA_VERSION_MAJOR}" STREQUAL "2") message(SEND_ERROR "Package VersionedA is major version [${VersionedA_VERSION_MAJOR}], not [2]") -endif(NOT "${VersionedA_VERSION_MAJOR}" STREQUAL "2") +endif() if(NOT "${VersionedA_VERSION_MINOR}" STREQUAL "0") message(SEND_ERROR "Package VersionedA is minor version [${VersionedA_VERSION_MINOR}], not [0]") -endif(NOT "${VersionedA_VERSION_MINOR}" STREQUAL "0") +endif() if(NOT "${VersionedB_VERSION}" STREQUAL "3.1") message(SEND_ERROR "Package VersionedB is version [${VersionedB_VERSION}], not [3.1]") -endif(NOT "${VersionedB_VERSION}" STREQUAL "3.1") +endif() if(NOT "${VersionedB_VERSION_MAJOR}" STREQUAL "3") message(SEND_ERROR "Package VersionedB is major version [${VersionedB_VERSION_MAJOR}], not [3]") -endif(NOT "${VersionedB_VERSION_MAJOR}" STREQUAL "3") +endif() if(NOT "${VersionedB_VERSION_MINOR}" STREQUAL "1") message(SEND_ERROR "Package VersionedB is minor version [${VersionedB_VERSION_MINOR}], not [1]") -endif(NOT "${VersionedB_VERSION_MINOR}" STREQUAL "1") +endif() if(NOT "${Special_VERSION}" STREQUAL "1.2") message(SEND_ERROR "Package Special is version [${Special_VERSION}], not [1.2]") -endif(NOT "${Special_VERSION}" STREQUAL "1.2") +endif() if(NOT "${Special_VERSION_MAJOR}" STREQUAL "1") message(SEND_ERROR "Package Special is major version [${Special_VERSION_MAJOR}], not [1]") -endif(NOT "${Special_VERSION_MAJOR}" STREQUAL "1") +endif() if(NOT "${Special_VERSION_MINOR}" STREQUAL "2") message(SEND_ERROR "Package Special is minor version [${Special_VERSION_MINOR}], not [2]") -endif(NOT "${Special_VERSION_MINOR}" STREQUAL "2") +endif() # Test version number comparison. if(NOT "1.2.3.4" VERSION_LESS "1.2.3.5") diff --git a/Tests/FindPackageTest/FindVersionTestA.cmake b/Tests/FindPackageTest/FindVersionTestA.cmake index c6031d9..9828593 100644 --- a/Tests/FindPackageTest/FindVersionTestA.cmake +++ b/Tests/FindPackageTest/FindVersionTestA.cmake @@ -1,18 +1,18 @@ if(NOT "${VersionTestA_FIND_VERSION}" STREQUAL "1") message(SEND_ERROR "VersionTestA_FIND_VERSION=${VersionTestA_FIND_VERSION} is not 1") -endif(NOT "${VersionTestA_FIND_VERSION}" STREQUAL "1") +endif() if(NOT "${VersionTestA_FIND_VERSION_MAJOR}" STREQUAL "1") message(SEND_ERROR "VersionTestA_FIND_VERSION_MAJOR=${VersionTestA_FIND_VERSION_MAJOR} is not 1") -endif(NOT "${VersionTestA_FIND_VERSION_MAJOR}" STREQUAL "1") +endif() if(NOT "${VersionTestA_FIND_VERSION_MINOR}" STREQUAL "0") message(SEND_ERROR "VersionTestA_FIND_VERSION_MINOR=${VersionTestA_FIND_VERSION_MINOR} is not 0") -endif(NOT "${VersionTestA_FIND_VERSION_MINOR}" STREQUAL "0") +endif() if(NOT "${VersionTestA_FIND_VERSION_PATCH}" STREQUAL "0") message(SEND_ERROR "VersionTestA_FIND_VERSION_PATCH=${VersionTestA_FIND_VERSION_PATCH} is not 0") -endif(NOT "${VersionTestA_FIND_VERSION_PATCH}" STREQUAL "0") +endif() if(NOT "${VersionTestA_FIND_VERSION_TWEAK}" STREQUAL "0") message(SEND_ERROR "VersionTestA_FIND_VERSION_TWEAK=${VersionTestA_FIND_VERSION_TWEAK} is not 0") -endif(NOT "${VersionTestA_FIND_VERSION_TWEAK}" STREQUAL "0") +endif() if(NOT "${VersionTestA_FIND_VERSION_COUNT}" STREQUAL "1") message(SEND_ERROR "VersionTestA_FIND_VERSION_COUNT=${VersionTestA_FIND_VERSION_COUNT} is not 1") -endif(NOT "${VersionTestA_FIND_VERSION_COUNT}" STREQUAL "1") +endif() diff --git a/Tests/FindPackageTest/FindVersionTestB.cmake b/Tests/FindPackageTest/FindVersionTestB.cmake index 914d5a7..1ebb823 100644 --- a/Tests/FindPackageTest/FindVersionTestB.cmake +++ b/Tests/FindPackageTest/FindVersionTestB.cmake @@ -1,18 +1,18 @@ if(NOT "${VersionTestB_FIND_VERSION}" STREQUAL "1.2") message(SEND_ERROR "VersionTestB_FIND_VERSION=${VersionTestB_FIND_VERSION} is not 1.2") -endif(NOT "${VersionTestB_FIND_VERSION}" STREQUAL "1.2") +endif() if(NOT "${VersionTestB_FIND_VERSION_MAJOR}" STREQUAL "1") message(SEND_ERROR "VersionTestB_FIND_VERSION_MAJOR=${VersionTestB_FIND_VERSION_MAJOR} is not 1") -endif(NOT "${VersionTestB_FIND_VERSION_MAJOR}" STREQUAL "1") +endif() if(NOT "${VersionTestB_FIND_VERSION_MINOR}" STREQUAL "2") message(SEND_ERROR "VersionTestB_FIND_VERSION_MINOR=${VersionTestB_FIND_VERSION_MINOR} is not 2") -endif(NOT "${VersionTestB_FIND_VERSION_MINOR}" STREQUAL "2") +endif() if(NOT "${VersionTestB_FIND_VERSION_PATCH}" STREQUAL "0") message(SEND_ERROR "VersionTestB_FIND_VERSION_PATCH=${VersionTestB_FIND_VERSION_PATCH} is not 0") -endif(NOT "${VersionTestB_FIND_VERSION_PATCH}" STREQUAL "0") +endif() if(NOT "${VersionTestB_FIND_VERSION_TWEAK}" STREQUAL "0") message(SEND_ERROR "VersionTestB_FIND_VERSION_TWEAK=${VersionTestB_FIND_VERSION_TWEAK} is not 0") -endif(NOT "${VersionTestB_FIND_VERSION_TWEAK}" STREQUAL "0") +endif() if(NOT "${VersionTestB_FIND_VERSION_COUNT}" STREQUAL "2") message(SEND_ERROR "VersionTestB_FIND_VERSION_COUNT=${VersionTestB_FIND_VERSION_COUNT} is not 2") -endif(NOT "${VersionTestB_FIND_VERSION_COUNT}" STREQUAL "2") +endif() diff --git a/Tests/FindPackageTest/FindVersionTestC.cmake b/Tests/FindPackageTest/FindVersionTestC.cmake index 66e07ea..450c2e9 100644 --- a/Tests/FindPackageTest/FindVersionTestC.cmake +++ b/Tests/FindPackageTest/FindVersionTestC.cmake @@ -1,18 +1,18 @@ if(NOT "${VersionTestC_FIND_VERSION}" STREQUAL "1.2.3") message(SEND_ERROR "VersionTestC_FIND_VERSION=${VersionTestC_FIND_VERSION} is not 1.2.3") -endif(NOT "${VersionTestC_FIND_VERSION}" STREQUAL "1.2.3") +endif() if(NOT "${VersionTestC_FIND_VERSION_MAJOR}" STREQUAL "1") message(SEND_ERROR "VersionTestC_FIND_VERSION_MAJOR=${VersionTestC_FIND_VERSION_MAJOR} is not 1") -endif(NOT "${VersionTestC_FIND_VERSION_MAJOR}" STREQUAL "1") +endif() if(NOT "${VersionTestC_FIND_VERSION_MINOR}" STREQUAL "2") message(SEND_ERROR "VersionTestC_FIND_VERSION_MINOR=${VersionTestC_FIND_VERSION_MINOR} is not 2") -endif(NOT "${VersionTestC_FIND_VERSION_MINOR}" STREQUAL "2") +endif() if(NOT "${VersionTestC_FIND_VERSION_PATCH}" STREQUAL "3") message(SEND_ERROR "VersionTestC_FIND_VERSION_PATCH=${VersionTestC_FIND_VERSION_PATCH} is not 3") -endif(NOT "${VersionTestC_FIND_VERSION_PATCH}" STREQUAL "3") +endif() if(NOT "${VersionTestC_FIND_VERSION_TWEAK}" STREQUAL "0") message(SEND_ERROR "VersionTestC_FIND_VERSION_TWEAK=${VersionTestC_FIND_VERSION_TWEAK} is not 0") -endif(NOT "${VersionTestC_FIND_VERSION_TWEAK}" STREQUAL "0") +endif() if(NOT "${VersionTestC_FIND_VERSION_COUNT}" STREQUAL "3") message(SEND_ERROR "VersionTestC_FIND_VERSION_COUNT=${VersionTestC_FIND_VERSION_COUNT} is not 3") -endif(NOT "${VersionTestC_FIND_VERSION_COUNT}" STREQUAL "3") +endif() diff --git a/Tests/FindPackageTest/FindVersionTestD.cmake b/Tests/FindPackageTest/FindVersionTestD.cmake index 88d9299..9f2db72 100644 --- a/Tests/FindPackageTest/FindVersionTestD.cmake +++ b/Tests/FindPackageTest/FindVersionTestD.cmake @@ -1,18 +1,18 @@ if(NOT "${VersionTestD_FIND_VERSION}" STREQUAL "1.2.3.4") message(SEND_ERROR "VersionTestD_FIND_VERSION=${VersionTestD_FIND_VERSION} is not 1.2.3.4") -endif(NOT "${VersionTestD_FIND_VERSION}" STREQUAL "1.2.3.4") +endif() if(NOT "${VersionTestD_FIND_VERSION_MAJOR}" STREQUAL "1") message(SEND_ERROR "VersionTestD_FIND_VERSION_MAJOR=${VersionTestD_FIND_VERSION_MAJOR} is not 1") -endif(NOT "${VersionTestD_FIND_VERSION_MAJOR}" STREQUAL "1") +endif() if(NOT "${VersionTestD_FIND_VERSION_MINOR}" STREQUAL "2") message(SEND_ERROR "VersionTestD_FIND_VERSION_MINOR=${VersionTestD_FIND_VERSION_MINOR} is not 2") -endif(NOT "${VersionTestD_FIND_VERSION_MINOR}" STREQUAL "2") +endif() if(NOT "${VersionTestD_FIND_VERSION_PATCH}" STREQUAL "3") message(SEND_ERROR "VersionTestD_FIND_VERSION_PATCH=${VersionTestD_FIND_VERSION_PATCH} is not 3") -endif(NOT "${VersionTestD_FIND_VERSION_PATCH}" STREQUAL "3") +endif() if(NOT "${VersionTestD_FIND_VERSION_TWEAK}" STREQUAL "4") message(SEND_ERROR "VersionTestD_FIND_VERSION_TWEAK=${VersionTestD_FIND_VERSION_TWEAK} is not 4") -endif(NOT "${VersionTestD_FIND_VERSION_TWEAK}" STREQUAL "4") +endif() if(NOT "${VersionTestD_FIND_VERSION_COUNT}" STREQUAL "4") message(SEND_ERROR "VersionTestD_FIND_VERSION_COUNT=${VersionTestD_FIND_VERSION_COUNT} is not 4") -endif(NOT "${VersionTestD_FIND_VERSION_COUNT}" STREQUAL "4") +endif() diff --git a/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake b/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake index 514e830..822b449 100644 --- a/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/arch/cmake/zot-4.0/zot-config-version.cmake @@ -3,5 +3,5 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) + endif() +endif() diff --git a/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake b/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake index 59fe59d..31573b9 100644 --- a/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/arch/zot-3.1/zot-config-version.cmake @@ -3,5 +3,5 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) + endif() +endif() diff --git a/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake index 7afcc9b..bcefcd7 100644 --- a/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/cmake/zot-4.0/zot-config-version.cmake @@ -3,6 +3,6 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 0) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 4) + endif() +endif() diff --git a/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake b/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake index 4e8ee82..b37bc8e 100644 --- a/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake +++ b/Tests/FindPackageTest/lib/suffix/test/SuffixTestConfigVersion.cmake @@ -3,5 +3,5 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 2) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 2) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 1) + endif() +endif() diff --git a/Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake b/Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake index 78e41a5..db3a8a4 100644 --- a/Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/zot-2.0/zot-config-version.cmake @@ -1,5 +1,5 @@ set(PACKAGE_VERSION 2.0) if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2) set(PACKAGE_VERSION_COMPATIBLE 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 2) +endif() diff --git a/Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake b/Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake index 8e3daff..dd9c939 100644 --- a/Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/zot-3.0/zot-config-version.cmake @@ -1,5 +1,5 @@ set(PACKAGE_VERSION 3.0) if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) set(PACKAGE_VERSION_COMPATIBLE 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) +endif() diff --git a/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake b/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake index b09c008..8fa767e 100644 --- a/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/zot-3.1/zot-config-version.cmake @@ -3,6 +3,6 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) + endif() +endif() diff --git a/Tests/FindPackageTest/lib/zot/zot-config-version.cmake b/Tests/FindPackageTest/lib/zot/zot-config-version.cmake index 5674f70..430f009 100644 --- a/Tests/FindPackageTest/lib/zot/zot-config-version.cmake +++ b/Tests/FindPackageTest/lib/zot/zot-config-version.cmake @@ -5,6 +5,6 @@ if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) set(PACKAGE_VERSION_COMPATIBLE 1) if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) set(PACKAGE_VERSION_EXACT 1) - endif("${PACKAGE_FIND_VERSION_MINOR}" EQUAL 1) -endif("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL 3) + endif() +endif() |