Browse Source

Cleanup cmake files

Alexey Edelev 5 years ago
parent
commit
2ebf5acd87
3 changed files with 1 additions and 8 deletions
  1. 1 1
      CMakeLists.txt
  2. 0 6
      src/generator/CMakeLists.txt
  3. 0 1
      src/protobuf/QtProtobufGen.cmake.in

+ 1 - 1
CMakeLists.txt

@@ -72,7 +72,7 @@ export(PACKAGE ${PROJECT_NAME})
 find_package(Doxygen)
 if(NOT DOXYGEN_FOUND)
     find_program(DOXYGEN_EXECUTABLE doxygen)
-endif(DOXYGEN_FOUND)
+endif()
 if(DEFINED DOXYGEN_EXECUTABLE)
     message(STATUS "DOXYGEN_EXECUTABLE: ${DOXYGEN_EXECUTABLE}")
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)

+ 0 - 6
src/generator/CMakeLists.txt

@@ -34,12 +34,6 @@ file(GLOB HEADERS classgeneratorbase.h
 
 add_executable(${TARGET} ${SOURCES})
 
-if(WIN32)
-    include_directories(${PROTOBUF_INSTALATION_PATH}/include)
-    set(PROTOBUF_LIBRARIES_PATH ${PROTOBUF_INSTALATION_PATH}/lib)
-    link_directories(${PROTOBUF_LIBRARIES_PATH} ${GRPC_LIBRARIES})
-endif()
-
 if(DEFINED Protobuf_INCLUDE_DIRS)
     target_include_directories(${TARGET} PUBLIC ${Protobuf_INCLUDE_DIRS})
 endif()

+ 0 - 1
src/protobuf/QtProtobufGen.cmake.in

@@ -38,7 +38,6 @@ function(generate_qtprotobuf)
     add_custom_command(
             OUTPUT ${QTPROTOBUF_GENERATED_SOURCES} ${QTPROTOBUF_GENERATED_HEADERS}
             COMMAND $<TARGET_FILE:protobuf::protoc>
-                --@GENERATOR_TARGET@_opt=out=${OUT_DIR}
                 --plugin=protoc-gen-@GENERATOR_TARGET@=${QTPROTOBUF_EXECUTABLE}
                 --@GENERATOR_TARGET@_out=${OUT_DIR}
                 ${PROTO_INCLUDES}