Преглед на файлове

Migrate to updated qtprotobuf

Alexey Edelev преди 4 години
родител
ревизия
6aef3ed4ac
променени са 3 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 1 1
      .gitmodules
  2. 6 2
      neuralnetworkui/CMakeLists.txt
  3. 1 1
      neuralnetworkui/qtprotobuf

+ 1 - 1
.gitmodules

@@ -1,3 +1,3 @@
 [submodule "neuralnetworkui/qtprotobuf"]
 	path = neuralnetworkui/qtprotobuf
-	url = git@git.semlanik.org:semlanik/qtprotobuf.git
+	url = git@github.com:semlanik/qtprotobuf.git

+ 6 - 2
neuralnetworkui/CMakeLists.txt

@@ -2,11 +2,14 @@ cmake_minimum_required(VERSION 2.8)
 
 project(NeuralNetworkUi LANGUAGES CXX)
 
+set(TARGET NeuralNetworkUi)
+
 find_package(Qt5 COMPONENTS Quick Gui Core Qml REQUIRED)
 
 set(QTPROTOBUF_MAKE_TESTS false)
 set(QTPROTOBUF_MAKE_EXAMPLES false)
 add_subdirectory("qtprotobuf")
+
 find_package(QtProtobufProject CONFIG COMPONENTS QtProtobuf QtGrpc REQUIRED)
 if(Qt5_POSITION_INDEPENDENT_CODE)
     set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
@@ -14,10 +17,11 @@ endif()
 
 file(GLOB PROTO_FILES ABSOLUTE "${CMAKE_CURRENT_SOURCE_DIR}/../src/git.semlanik.org/semlanik/NeuralNetwork/remotecontrol/remotecontrol.proto")
 
-generate_qtprotobuf(TARGET NeuralNetworkUi PROTO_FILES ${PROTO_FILES} QML TRUE)
+message("PROTO_FILES: ${PROTO_FILES}")
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 add_executable(NeuralNetworkUi main.cpp qml.qrc valueindicator.cpp visualizermodel.cpp dense.cpp layertrigger.cpp)
-target_link_libraries(NeuralNetworkUi Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick QtProtobufProject::QtProtobuf QtProtobufProject::QtGrpc ${QtProtobuf_GENERATED})
+generate_qtprotobuf(TARGET ${TARGET} PROTO_FILES ${PROTO_FILES} QML TRUE)
+target_link_libraries(NeuralNetworkUi PRIVATE Qt5::Core Qt5::Gui Qt5::Qml Qt5::Quick QtProtobufProject::QtProtobuf QtProtobufProject::QtGrpc ${QtProtobuf_GENERATED})

+ 1 - 1
neuralnetworkui/qtprotobuf

@@ -1 +1 @@
-Subproject commit 6742f1167b945f2eee5032b997cf9250778a0e93
+Subproject commit 8cd7bdd128a64f9b60cc335306c49e6dab6ed1c7