From 4c121b68c861ddbfa4eb5bbe8858cf5fae9fa343 Mon Sep 17 00:00:00 2001 From: Juan Ramos <114601453+juan-lunarg@users.noreply.github.com> Date: Wed, 22 Nov 2023 14:48:14 -0700 Subject: [PATCH] cmake: Remove find_host_package macro Originally added in https://github.com/KhronosGroup/glslang/pull/2395 With the rational of causing issues when cross-compiling for iOS. This is no longer the case. --- CMakeLists.txt | 8 -------- StandAlone/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5757b83..9b37bc79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,12 +204,6 @@ function(glslang_set_link_args TARGET) endif() endfunction(glslang_set_link_args) -if(NOT COMMAND find_host_package) - macro(find_host_package) - find_package(${ARGN}) - endmacro() -endif() - # Root directory for build-time generated include files set(GLSLANG_GENERATED_INCLUDEDIR "${CMAKE_BINARY_DIR}/include") @@ -269,8 +263,6 @@ else() endif() if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) - find_host_package(Python3 REQUIRED) - # We depend on these for later projects, so they should come first. add_subdirectory(External) endif() diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index 88b8f023..124742a9 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -31,7 +31,7 @@ # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -find_host_package(Python3 REQUIRED) +find_package(Python3 REQUIRED) set(GLSLANG_INTRINSIC_H "${GLSLANG_GENERATED_INCLUDEDIR}/glslang/glsl_intrinsic_header.h") set(GLSLANG_INTRINSIC_PY "${CMAKE_CURRENT_SOURCE_DIR}/../gen_extension_headers.py")