Changeset 920626f in nscp for service


Ignore:
Timestamp:
01/31/10 14:18:08 (3 years ago)
Author:
Michael Medin <michael@…>
Branches:
master, 0.4.0, 0.4.1, 0.4.2
Children:
dad34ea
Parents:
2018659
Message:

Made some changes to facilitate building protocol buffer files from cmake

Location:
service
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • service/CMakeLists.txt

    r2018659 r920626f  
    77 
    88ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES}) 
     9 
     10# Workaround for bug 0003353 in cmake (aparently not fixed) 
     11#WRAP_PROTO(PB_PLUGIN ${PB_PATH}/plugin.pb) 
     12#SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE) 
    913 
    1014SET(service_SRCS 
    … …  
    7377target_link_libraries(nsclient++  
    7478  ${Boost_FILESYSTEM_LIBRARY} 
    75   ${PROTOBUF_LIBRARY} 
     79  ${NSCP_DEF_PLUGIN_LIB} 
    7680) 
    7781 

  • service/NSClient++.cpp

    r2018659 r920626f  
    4040#include "service_manager.hpp" 
    4141 
    42 #include "../proto/plugin.pb.h" 
     42#include "../proto/plugin.proto.h" 
    4343 
    4444NSClient mainClient(SZSERVICENAME); // Global core instance. 
Note: See TracChangeset for help on using the changeset viewer.