From f5fa593143e40c6669d14cc4d6fa38cebefabf8d Mon Sep 17 00:00:00 2001 From: Moritz Heinemann Date: Wed, 15 Feb 2023 20:06:26 +0100 Subject: [PATCH] move ResourceLimits from StandAlone to glslang dir (Fix #3064) --- BUILD.bazel | 2 +- BUILD.gn | 2 +- StandAlone/CMakeLists.txt | 25 ------------ glslang/CMakeLists.txt | 40 ++++++++++++++++++- .../ResourceLimits}/ResourceLimits.cpp | 0 .../ResourceLimits}/resource_limits_c.cpp | 0 6 files changed, 40 insertions(+), 29 deletions(-) rename {StandAlone => glslang/ResourceLimits}/ResourceLimits.cpp (100%) rename {StandAlone => glslang/ResourceLimits}/resource_limits_c.cpp (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 8dd76e07..b6295839 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -209,7 +209,7 @@ cc_library( cc_library( name = "glslang-default-resource-limits", - srcs = ["StandAlone/ResourceLimits.cpp"], + srcs = ["glslang/ResourceLimits/ResourceLimits.cpp"], hdrs = ["glslang/Public/ResourceLimits.h"], copts = COMMON_COPTS, linkstatic = 1, diff --git a/BUILD.gn b/BUILD.gn index 0aacbf5a..85a4bed2 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -299,7 +299,7 @@ glslang_sources_common("glslang_sources") { source_set("glslang_default_resource_limits_sources") { sources = [ - "StandAlone/ResourceLimits.cpp", + "glslang/ResourceLimits/ResourceLimits.cpp", "glslang/Public/ResourceLimits.h", "glslang/Include/ResourceLimits.h", ] diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index 81d8c3b3..b1ba18f6 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -47,17 +47,6 @@ add_custom_command( #add_custom_target(glslangValidator DEPENDS ${GLSLANG_INTRINSIC_H}) -add_library(glslang-default-resource-limits - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) -set_target_properties(glslang-default-resource-limits PROPERTIES VERSION "${GLSLANG_VERSION}" SOVERSION "${GLSLANG_VERSION_MAJOR}") -set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) -set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) - -target_include_directories(glslang-default-resource-limits - PUBLIC $ - PUBLIC $) - set(SOURCES StandAlone.cpp DirStackFileIncluder.h ${GLSLANG_INTRINSIC_H}) add_executable(glslangValidator ${SOURCES}) @@ -135,18 +124,4 @@ if(ENABLE_GLSLANG_INSTALL) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/spirv-remapTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) endif() - install(TARGETS glslang-default-resource-limits EXPORT glslang-targets) - - # Backward compatibility - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-default-resource-limitsTargets.cmake" " - message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") - - if (NOT TARGET glslang::glslang-default-resource-limits) - include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") - endif() - - add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits) - ") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslang-default-resource-limitsTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index 7709f098..f8708397 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt @@ -149,8 +149,6 @@ set(GLSLANG_SOURCES set(GLSLANG_HEADERS Public/ShaderLang.h - Public/ResourceLimits.h - Public/resource_limits_c.h Include/arrays.h Include/BaseTypes.h Include/Common.h @@ -185,6 +183,30 @@ if(WIN32 AND BUILD_SHARED_LIBS) set_target_properties(glslang PROPERTIES PREFIX "") endif() +################################################################################ +# ResourceLimits +################################################################################ +set(RESOURCELIMITS_SOURCES + ResourceLimits/ResourceLimits.cpp + ResourceLimits/resource_limits_c.cpp +) + +set(RESOURCELIMITS_HEADERS + Public/ResourceLimits.h + Public/resource_limits_c.h +) + +add_library(glslang-default-resource-limits ${RESOURCELIMITS_SOURCES} ${RESOURCELIMITS_HEADERS}) +set_target_properties(glslang-default-resource-limits PROPERTIES + VERSION "${GLSLANG_VERSION}" + SOVERSION "${GLSLANG_VERSION_MAJOR}" + FOLDER glslang + POSITION_INDEPENDENT_CODE ON) + +target_include_directories(glslang-default-resource-limits PUBLIC + $ + $) + ################################################################################ # source_groups ################################################################################ @@ -237,4 +259,18 @@ if(ENABLE_GLSLANG_INSTALL) install(FILES ${GLSLANG_BUILD_INFO_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang) + install(TARGETS glslang-default-resource-limits EXPORT glslang-targets) + + # Backward compatibility + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/glslang-default-resource-limitsTargets.cmake" " + message(WARNING \"Using `glslang-default-resource-limitsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::glslang-default-resource-limits) + include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(glslang-default-resource-limits ALIAS glslang::glslang-default-resource-limits) + ") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glslang-default-resource-limitsTargets.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif() diff --git a/StandAlone/ResourceLimits.cpp b/glslang/ResourceLimits/ResourceLimits.cpp similarity index 100% rename from StandAlone/ResourceLimits.cpp rename to glslang/ResourceLimits/ResourceLimits.cpp diff --git a/StandAlone/resource_limits_c.cpp b/glslang/ResourceLimits/resource_limits_c.cpp similarity index 100% rename from StandAlone/resource_limits_c.cpp rename to glslang/ResourceLimits/resource_limits_c.cpp