Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added gflags and protobuf as submodules
  • Loading branch information
zpzim committed Jan 3, 2019
1 parent 506a315 commit 41cd040
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
@@ -0,0 +1,6 @@
[submodule "protobuf"]
path = protobuf
url = https://github.com/protocolbuffers/protobuf
[submodule "gflags"]
path = gflags
url = https://github.com/gflags/gflags
5 changes: 4 additions & 1 deletion CMakeLists.txt
Expand Up @@ -6,7 +6,9 @@ cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
project(SCAMP LANGUAGES CXX CUDA)
set(VERSION_MAJOR 1)
set(VERSION_MINOR 1)
find_package(gflags REQUIRED)

add_subdirectory(gflags)

find_program(
CLANG_TIDY_EXE
NAMES clang-tidy-6.0 clang-tidy-5.0 clang-tidy
Expand All @@ -31,6 +33,7 @@ else()
endif()


add_subdirectory(protobuf/cmake)
add_subdirectory(proto)


Expand Down
1 change: 1 addition & 0 deletions gflags
Submodule gflags added at e171aa
5 changes: 3 additions & 2 deletions proto/CMakeLists.txt
@@ -1,5 +1,6 @@
find_package(Protobuf REQUIRED)
set(Protobuf_SRC_ROOT_FOLDER, "../protobuf")
find_package( Protobuf REQUIRED )
file(GLOB ProtoFiles "${CMAKE_CURRENT_SOURCE_DIR}/*.proto")
PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
add_library(messages STATIC ${ProtoSources} ${ProtoHeaders})
target_link_libraries(messages ${PROTOBUF_LIBRARY})
target_link_libraries(messages libprotobuf libprotobuf-lite libprotoc)
1 change: 1 addition & 0 deletions protobuf
Submodule protobuf added at 48cb18

0 comments on commit 41cd040

Please sign in to comment.