Skip to content

Commit

Permalink
feat build: support OS with case insensitive FS
Browse files Browse the repository at this point in the history
Tests: протестировано CI
commit_hash:12aa096ece94e24823850145dcfaa15bfc305fcd
  • Loading branch information
apolukhin committed Nov 6, 2024
1 parent 3506025 commit 3df5e8a
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,6 @@
"cmake/FindPackageRequired.cmake":"taxi/uservices/userver/cmake/FindPackageRequired.cmake",
"cmake/GenGdbPrinters.cmake":"taxi/uservices/userver/cmake/GenGdbPrinters.cmake",
"cmake/GetUserverVersion.cmake":"taxi/uservices/userver/cmake/GetUserverVersion.cmake",
"cmake/GrpcTargets.cmake":"taxi/uservices/userver/cmake/GrpcTargets.cmake",
"cmake/IncludeWhatYouUse.cmake":"taxi/uservices/userver/cmake/IncludeWhatYouUse.cmake",
"cmake/ModuleHelpers.cmake":"taxi/uservices/userver/cmake/ModuleHelpers.cmake",
"cmake/PrepareInstall.cmake":"taxi/uservices/userver/cmake/PrepareInstall.cmake",
Expand Down Expand Up @@ -365,6 +364,7 @@
"cmake/SetupYdbCppSDK.cmake":"taxi/uservices/userver/cmake/SetupYdbCppSDK.cmake",
"cmake/Stacktrace.cmake":"taxi/uservices/userver/cmake/Stacktrace.cmake",
"cmake/UserverCxxCompileOptionsIfSupported.cmake":"taxi/uservices/userver/cmake/UserverCxxCompileOptionsIfSupported.cmake",
"cmake/UserverGrpcTargets.cmake":"taxi/uservices/userver/cmake/UserverGrpcTargets.cmake",
"cmake/UserverModule.cmake":"taxi/uservices/userver/cmake/UserverModule.cmake",
"cmake/UserverPack.cmake":"taxi/uservices/userver/cmake/UserverPack.cmake",
"cmake/UserverRequireDWCAS.cmake":"taxi/uservices/userver/cmake/UserverRequireDWCAS.cmake",
Expand Down
2 changes: 1 addition & 1 deletion cmake/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ It contains several scripts intended for external usage:
userver_testsuite_add_simple()
```

* `GrpcTargets.cmake` defines functions for generating userver gRPC
* `UserverGrpcTargets.cmake` defines functions for generating userver gRPC
clients and services

* `AddGoogleTests.cmake` defines functions for creating CTest tests
Expand Down
2 changes: 1 addition & 1 deletion cmake/SetupGoogleProtoApis.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (NOT api-common-protos_SOURCE_DIR)
message(FATAL_ERROR "Unable to get google common proto apis. It is required for userver-grpc build.")
endif()

include(GrpcTargets)
include(UserverGrpcTargets)
file(GLOB_RECURSE SOURCES
${api-common-protos_SOURCE_DIR}/*.proto)

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion cmake/install/userver-grpc-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ find_package(userver REQUIRED COMPONENTS

set(USERVER_GRPC_SCRIPTS_PATH "${USERVER_CMAKE_DIR}/grpc")

include("${USERVER_CMAKE_DIR}/GrpcTargets.cmake")
include("${USERVER_CMAKE_DIR}/UserverGrpcTargets.cmake")

set(userver_grpc_FOUND TRUE)
4 changes: 2 additions & 2 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def copy_component(component):
)
copy(
self,
pattern='GrpcTargets.cmake',
pattern='UserverGrpcTargets.cmake',
dst=os.path.join(self.package_folder, 'cmake'),
src=os.path.join(self.source_folder, 'cmake'),
keep_path=True,
Expand Down Expand Up @@ -721,7 +721,7 @@ def add_components(components):
os.path.join(self._cmake_subfolder, 'GrpcConan.cmake'),
)
build_modules.append(
os.path.join(self._cmake_subfolder, 'GrpcTargets.cmake'),
os.path.join(self._cmake_subfolder, 'UserverGrpcTargets.cmake'),
)

self.cpp_info.set_property('cmake_build_modules', build_modules)
4 changes: 2 additions & 2 deletions grpc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(userver-grpc CXX)

include(GrpcTargets)
include(UserverGrpcTargets)

add_library(${PROJECT_NAME}-deps INTERFACE)
target_include_directories(${PROJECT_NAME}-deps INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
Expand Down Expand Up @@ -211,7 +211,7 @@ _userver_install_targets(COMPONENT grpc TARGETS ${PROJECT_NAME})
_userver_directory_install(COMPONENT grpc FILES
"${USERVER_ROOT_DIR}/cmake/SetupProtobuf.cmake"
"${USERVER_ROOT_DIR}/cmake/SetupGrpc.cmake"
"${USERVER_ROOT_DIR}/cmake/GrpcTargets.cmake"
"${USERVER_ROOT_DIR}/cmake/UserverGrpcTargets.cmake"
"${USERVER_ROOT_DIR}/cmake/install/userver-grpc-config.cmake"
"${USERVER_ROOT_DIR}/cmake/modules/FindUserverGrpc.cmake"
DIRECTORY
Expand Down
2 changes: 1 addition & 1 deletion grpc/functional_tests/basic_chaos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(userver-grpc-tests-basic-chaos CXX)

add_executable(${PROJECT_NAME} main.cpp)

include(GrpcTargets)
include(UserverGrpcTargets)
userver_add_grpc_library(${PROJECT_NAME}-proto PROTOS samples/greeter.proto)
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)

Expand Down
2 changes: 1 addition & 1 deletion grpc/functional_tests/basic_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(userver-grpc-tests-basic-server CXX)
add_executable(${PROJECT_NAME} grpc_service.cpp)
target_link_libraries(${PROJECT_NAME} userver-core)

include(GrpcTargets)
include(UserverGrpcTargets)
userver_add_grpc_library(${PROJECT_NAME}-proto PROTOS samples/greeter.proto)
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)

Expand Down
2 changes: 1 addition & 1 deletion grpc/functional_tests/metrics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(userver-grpc-tests-metrics CXX)

add_executable(${PROJECT_NAME} src/main.cpp)

include(GrpcTargets)
include(UserverGrpcTargets)
userver_add_grpc_library(${PROJECT_NAME}-proto PROTOS samples/greeter.proto)
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)

Expand Down
2 changes: 1 addition & 1 deletion grpc/functional_tests/middleware_server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ file(GLOB SOURCES src/*.*pp)

add_executable(${PROJECT_NAME} ${SOURCES})

include(GrpcTargets)
include(UserverGrpcTargets)
userver_add_grpc_library(${PROJECT_NAME}-proto PROTOS samples/greeter.proto)
target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}-proto)

Expand Down
2 changes: 1 addition & 1 deletion grpc/handlers/functional_tests/health/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ project(userver-grpc-handlers-tests-health CXX)
add_executable(${PROJECT_NAME} service.cpp)
target_link_libraries(${PROJECT_NAME} userver-grpc-handlers)

include(GrpcTargets)
include(UserverGrpcTargets)

userver_chaos_testsuite_add(
PYTHONPATH "${CMAKE_CURRENT_BINARY_DIR}/../../proto"
Expand Down
2 changes: 1 addition & 1 deletion otlp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project(userver-otlp CXX)

include(GrpcTargets)
include(UserverGrpcTargets)
include(SetupOpentelemetryProto)

userver_module(otlp
Expand Down

0 comments on commit 3df5e8a

Please sign in to comment.