Skip to content

Commit 5a8d3d4

Browse files
committed
fix(#1091): move proto gen file into build/src/proto
1 parent 7cc3a6a commit 5a8d3d4

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

src/CMakeLists.txt

+13-6
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,28 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
include_directories(${INCLUDE_DIRECTORIES} ${PROJECT_SOURCE_DIR}/src)
15+
include_directories(
16+
${INCLUDE_DIRECTORIES}
17+
${PROJECT_SOURCE_DIR}/src
18+
${CMAKE_BINARY_DIR}/src)
1619

1720
add_subdirectory(statistics)
1821

22+
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/src/proto)
23+
24+
set(PROTO_FILES "")
1925
function(compile_proto proto_name project_dir)
20-
add_custom_command(OUTPUT ${project_dir}/src/proto/${proto_name}.pb.cc
26+
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/src/proto/${proto_name}.pb.cc
2127
COMMAND ${Protobuf_PROTOC_EXECUTABLE} -I ${PROJECT_SOURCE_DIR}/src/proto
22-
--cpp_out=${project_dir}/src/proto/
28+
--cpp_out=${CMAKE_BINARY_DIR}/src/proto
2329
--java_out=${project_dir}/java/openmldb-native/src/main/java
2430
--java_out=${project_dir}/java/openmldb-import/src/main/java
2531
--java_out=${project_dir}/java/openmldb-taskmanager/src/main/java
2632
--java_out=${project_dir}/java/openmldb-common/src/main/java
2733
${project_dir}/src/proto/${proto_name}.proto
28-
DEPENDS ${project_dir}/src/proto/${proto_name}.proto
29-
)
34+
DEPENDS ${project_dir}/src/proto/${proto_name}.proto)
35+
list(APPEND PROTO_FILES ${CMAKE_BINARY_DIR}/src/proto/${proto_name}.pb.cc)
36+
set(PROTO_FILES ${PROTO_FILES} PARENT_SCOPE)
3037
endfunction(compile_proto)
3138

3239
function(compile_lib LIB_NAME DIR DEPEND_FILE_LIST)
@@ -103,7 +110,7 @@ compile_lib(log log "flags.cc")
103110
compile_lib(openmldb_sdk sdk "")
104111
compile_lib(apiserver apiserver "")
105112

106-
add_library(openmldb_proto STATIC proto/type.pb.cc proto/common.pb.cc proto/tablet.pb.cc proto/name_server.pb.cc proto/sql_procedure.pb.cc proto/api_server.pb.cc proto/taskmanager.pb.cc proto/name_server.pb.cc)
113+
add_library(openmldb_proto STATIC ${PROTO_FILES})
107114

108115
add_library(openmldb_flags STATIC flags.cc)
109116

0 commit comments

Comments
 (0)