Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
protobuf-c
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
spbro
protobuf-c
Commits
8b3207c4
Unverified
Commit
8b3207c4
authored
Mar 21, 2024
by
Robert Edmonds
Committed by
GitHub
Mar 21, 2024
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #699 from AlessandroBono/wip/abono/double-hyphens
CMakeLists.txt: Remove double hyphens
parents
67b1c353
9b1d4a35
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
build-cmake/CMakeLists.txt
build-cmake/CMakeLists.txt
+4
-4
No files found.
build-cmake/CMakeLists.txt
View file @
8b3207c4
...
...
@@ -147,7 +147,7 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
SET
(
CMAKE_CXX_EXTENSIONS OFF
)
add_custom_target
(
protoc-generated-files
COMMAND
${
CMAKE_COMMAND
}
-E env PATH=
"
${
OS_PATH_VARIABLE
}
"
--
${
PROTOBUF_PROTOC_EXECUTABLE
}
COMMAND
${
CMAKE_COMMAND
}
-E env PATH=
"
${
OS_PATH_VARIABLE
}
"
${
PROTOBUF_PROTOC_EXECUTABLE
}
--cpp_out
${
CMAKE_CURRENT_BINARY_DIR
}
-I
${
PROTOBUF_INCLUDE_DIR
}
-I
${
MAIN_DIR
}
${
MAIN_DIR
}
/protobuf-c/protobuf-c.proto
COMMENT Running protoc on
${
MAIN_DIR
}
/protobuf-c/protobuf-c.proto
...
...
@@ -186,7 +186,7 @@ ENDIF (MSVC AND BUILD_SHARED_LIBS)
FUNCTION
(
GENERATE_TEST_SOURCES PROTO_FILE SRC HDR
)
ADD_CUSTOM_COMMAND
(
OUTPUT
${
SRC
}
${
HDR
}
COMMAND
${
CMAKE_COMMAND
}
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
--
${
PROTOBUF_PROTOC_EXECUTABLE
}
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
${
PROTOBUF_PROTOC_EXECUTABLE
}
--plugin=$<TARGET_FILE_NAME:protoc-gen-c> -I
${
MAIN_DIR
}
${
PROTO_FILE
}
--c_out=
${
CMAKE_CURRENT_BINARY_DIR
}
DEPENDS protoc-gen-c
)
ENDFUNCTION
()
...
...
@@ -201,7 +201,7 @@ TARGET_LINK_LIBRARIES(test-generated-code protobuf-c)
ADD_CUSTOM_COMMAND
(
OUTPUT t/test-full.pb.cc t/test-full.pb.h
COMMAND
${
CMAKE_COMMAND
}
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
--
${
PROTOBUF_PROTOC_EXECUTABLE
}
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
${
PROTOBUF_PROTOC_EXECUTABLE
}
--cpp_out
${
CMAKE_CURRENT_BINARY_DIR
}
-I
${
MAIN_DIR
}
${
TEST_DIR
}
/test-full.proto
)
...
...
@@ -220,7 +220,7 @@ ENDIF (MSVC AND BUILD_SHARED_LIBS)
FILE
(
MAKE_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/t/generated-code2
)
ADD_CUSTOM_COMMAND
(
OUTPUT t/generated-code2/test-full-cxx-output.inc
COMMAND
${
CMAKE_COMMAND
}
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
--
cxx-generate-packed-data
ARGS -E env PATH=
"
${
OS_PATH_VARIABLE
}
"
cxx-generate-packed-data
">t/generated-code2/test-full-cxx-output.inc"
DEPENDS cxx-generate-packed-data
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment