Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
dd331485
Commit
dd331485
authored
8 years ago
by
Konstantin Podsvirov
Browse files
Options
Downloads
Patches
Plain Diff
CMake: Fix configuration file format bug
parent
13016cc4
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-4
4 additions, 4 deletions
CMakeLists.txt
templates/CMakeLists.txt.template
+4
-4
4 additions, 4 deletions
templates/CMakeLists.txt.template
with
8 additions
and
8 deletions
CMakeLists.txt
+
4
−
4
View file @
dd331485
...
@@ -84,7 +84,7 @@ elseif("${gRPC_ZLIB_PROVIDER}" STREQUAL "package")
...
@@ -84,7 +84,7 @@ elseif("${gRPC_ZLIB_PROVIDER}" STREQUAL "package")
if
(
TARGET ZLIB::ZLIB
)
if
(
TARGET ZLIB::ZLIB
)
set
(
_gRPC_ZLIB_LIBRARIES ZLIB::ZLIB
)
set
(
_gRPC_ZLIB_LIBRARIES ZLIB::ZLIB
)
endif
()
endif
()
set
(
_gRPC_FIND_ZLIB
"if(NOT ZLIB_FOUND) find_package(ZLIB)
endif()"
)
set
(
_gRPC_FIND_ZLIB
"if(NOT ZLIB_FOUND)
\n
find_package(ZLIB)
\n
endif()"
)
endif
()
endif
()
if
(
"
${
gRPC_PROTOBUF_PROVIDER
}
"
STREQUAL
"module"
)
if
(
"
${
gRPC_PROTOBUF_PROVIDER
}
"
STREQUAL
"module"
)
...
@@ -117,10 +117,10 @@ elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package")
...
@@ -117,10 +117,10 @@ elseif("${gRPC_PROTOBUF_PROVIDER}" STREQUAL "package")
if
(
TARGET protobuf::libprotoc
)
if
(
TARGET protobuf::libprotoc
)
set
(
_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc
)
set
(
_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc
)
endif
()
endif
()
set
(
_gRPC_FIND_PROTOBUF
"if(NOT protobuf_FOUND) find_package(protobuf CONFIG)
endif()"
)
set
(
_gRPC_FIND_PROTOBUF
"if(NOT protobuf_FOUND)
\n
find_package(protobuf CONFIG)
\n
endif()"
)
else
()
else
()
find_package
(
Protobuf MODULE
)
find_package
(
Protobuf MODULE
)
set
(
_gRPC_FIND_PROTOBUF
"if(NOT Protobuf_FOUND) find_package(Protobuf)
endif()"
)
set
(
_gRPC_FIND_PROTOBUF
"if(NOT Protobuf_FOUND)
\n
find_package(Protobuf)
\n
endif()"
)
endif
()
endif
()
endif
()
endif
()
...
@@ -141,7 +141,7 @@ elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package")
...
@@ -141,7 +141,7 @@ elseif("${gRPC_SSL_PROVIDER}" STREQUAL "package")
if
(
TARGET OpenSSL::SSL
)
if
(
TARGET OpenSSL::SSL
)
set
(
_gRPC_SSL_LIBRARIES OpenSSL::SSL
)
set
(
_gRPC_SSL_LIBRARIES OpenSSL::SSL
)
endif
()
endif
()
set
(
_gRPC_FIND_SSL
"if(NOT OpenSSL_FOUND) find_package(OpenSSL)
endif()"
)
set
(
_gRPC_FIND_SSL
"if(NOT OpenSSL_FOUND)
\n
find_package(OpenSSL)
\n
endif()"
)
endif
()
endif
()
if
(
NOT MSVC
)
if
(
NOT MSVC
)
...
...
This diff is collapsed.
Click to expand it.
templates/CMakeLists.txt.template
+
4
−
4
View file @
dd331485
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
if(TARGET ZLIB::ZLIB)
if(TARGET ZLIB::ZLIB)
set(_gRPC_ZLIB_LIBRARIES ZLIB::ZLIB)
set(_gRPC_ZLIB_LIBRARIES ZLIB::ZLIB)
endif()
endif()
set(_gRPC_FIND_ZLIB "if(NOT ZLIB_FOUND) find_package(ZLIB)
endif()")
set(_gRPC_FIND_ZLIB "if(NOT ZLIB_FOUND)
\n
find_package(ZLIB)
\n
endif()")
endif()
endif()
if("<%text>${gRPC_PROTOBUF_PROVIDER}</%text>" STREQUAL "module")
if("<%text>${gRPC_PROTOBUF_PROVIDER}</%text>" STREQUAL "module")
...
@@ -135,10 +135,10 @@
...
@@ -135,10 +135,10 @@
if(TARGET protobuf::libprotoc)
if(TARGET protobuf::libprotoc)
set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc)
set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc)
endif()
endif()
set(_gRPC_FIND_PROTOBUF "if(NOT protobuf_FOUND) find_package(protobuf CONFIG)
endif()")
set(_gRPC_FIND_PROTOBUF "if(NOT protobuf_FOUND)
\n
find_package(protobuf CONFIG)
\n
endif()")
else()
else()
find_package(Protobuf MODULE)
find_package(Protobuf MODULE)
set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND) find_package(Protobuf)
endif()")
set(_gRPC_FIND_PROTOBUF "if(NOT Protobuf_FOUND)
\n
find_package(Protobuf)
\n
endif()")
endif()
endif()
endif()
endif()
...
@@ -159,7 +159,7 @@
...
@@ -159,7 +159,7 @@
if(TARGET OpenSSL::SSL)
if(TARGET OpenSSL::SSL)
set(_gRPC_SSL_LIBRARIES OpenSSL::SSL)
set(_gRPC_SSL_LIBRARIES OpenSSL::SSL)
endif()
endif()
set(_gRPC_FIND_SSL "if(NOT OpenSSL_FOUND) find_package(OpenSSL)
endif()")
set(_gRPC_FIND_SSL "if(NOT OpenSSL_FOUND)
\n
find_package(OpenSSL)
\n
endif()")
endif()
endif()
if(NOT MSVC)
if(NOT MSVC)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment