reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-13 14:27:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tests: Simplify GeneratorExpression imported include directory check

Browse Source 
Do not duplicate the list of include directories 4 times.
This commit is contained in:
Brad King 2017-01-26 10:09:55 -05:00
parent a45de72cc4
commit 1a2a9b0d08
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/GeneratorExpression/CMakeLists.txt
View File

@ -187,10 +187,7 @@ add_custom_target(check-part3 ALL
-Dtest_version_equal_1=$<VERSION_EQUAL:1.0.1,1.1>
-Dtest_version_equal_2=$<VERSION_EQUAL:1.1,1.1>
-Dconfig=$<CONFIGURATION>
-Dtest_imported_debug=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-Dtest_imported_release=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-Dtest_imported_relwithdebinfo=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-Dtest_imported_minsizerel=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-Dtest_imported_includes=$<TARGET_PROPERTY:imported4,INCLUDE_DIRECTORIES>
-Dtest_imported_fallback=$<STREQUAL:$<TARGET_FILE_NAME:importedFallback>,fallback_loc>
-Dtest_alias_file_exe=$<STREQUAL:$<TARGET_FILE:Alias::SomeExe>,$<TARGET_FILE:someexe>>
-Dtest_alias_file_lib=$<STREQUAL:$<TARGET_FILE:Alias::SomeLib>,$<TARGET_FILE:empty1>>

19
Tests/GeneratorExpression/check-part3.cmake
View File

@ -8,18 +8,15 @@ check(test_version_less_2 "1")
check(test_version_equal_1 "0")
check(test_version_equal_2 "1")
foreach(c debug release relwithdebinfo minsizerel)
if(config AND NOT config STREQUAL NoConfig)
if(NOT "${test_imported_${c}}" MATCHES "^;/imported2/include$"
AND NOT "${test_imported_${c}}" MATCHES "^/imported1/include;$")
message(SEND_ERROR "test_imported_${c} is not correct: ${test_imported_${c}}")
endif()
else()
if(NOT "${test_imported_${c}}" MATCHES "^;$")
message(SEND_ERROR "test_imported_${c} is not an empty list: ${test_imported_${c}}")
endif()
if(config AND NOT config STREQUAL NoConfig)
if(NOT "${test_imported_includes}" MATCHES "^;*/imported[12]/include;*$")
message(SEND_ERROR "test_imported_includes is not correct: ${test_imported_includes}")
endif()
endforeach()
else()
if(NOT "${test_imported_includes}" MATCHES "^;$")
message(SEND_ERROR "test_imported_includes is not an empty list: ${test_imported_includes}")
endif()
endif()
check(test_imported_fallback "1")