Skip to content

Commit c52ca3c

Browse files
committed
Refactor packages found/not found configuration
1 parent dfc32b5 commit c52ca3c

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

cmake/cmake/modules/PHP/Bison.cmake

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -660,11 +660,17 @@ function(_php_bison_download)
660660
endif()
661661

662662
# Move dependency to PACKAGES_FOUND.
663-
get_property(packagesNotFound GLOBAL PROPERTY PACKAGES_NOT_FOUND)
664-
list(REMOVE_ITEM packagesNotFound BISON)
665-
set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND ${packagesNotFound})
666-
get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
667-
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND BISON)
663+
block()
664+
set(package "BISON")
665+
get_property(packagesNotFound GLOBAL PROPERTY PACKAGES_NOT_FOUND)
666+
list(REMOVE_ITEM packagesNotFound ${package})
667+
set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND ${packagesNotFound})
668+
get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
669+
list(FIND packagesFound ${package} found)
670+
if(found EQUAL -1)
671+
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND ${package})
672+
endif()
673+
endblock()
668674

669675
set(
670676
_PHP_BISON_DOWNLOAD

cmake/cmake/modules/PHP/Re2c.cmake

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -674,11 +674,17 @@ function(_php_re2c_download)
674674
add_dependencies(RE2C::RE2C re2c)
675675

676676
# Move dependency to PACKAGES_FOUND.
677-
get_property(packagesNotFound GLOBAL PROPERTY PACKAGES_NOT_FOUND)
678-
list(REMOVE_ITEM packagesNotFound RE2C)
679-
set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND ${packagesNotFound})
680-
get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
681-
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND RE2C)
677+
block()
678+
set(package "RE2C")
679+
get_property(packagesNotFound GLOBAL PROPERTY PACKAGES_NOT_FOUND)
680+
list(REMOVE_ITEM packagesNotFound ${package})
681+
set_property(GLOBAL PROPERTY PACKAGES_NOT_FOUND ${packagesNotFound})
682+
get_property(packagesFound GLOBAL PROPERTY PACKAGES_FOUND)
683+
list(FIND packagesFound ${package} found)
684+
if(found EQUAL -1)
685+
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND ${package})
686+
endif()
687+
endblock()
682688

683689
set(
684690
_PHP_RE2C_DOWNLOAD

0 commit comments

Comments
 (0)