Changeset afd42f1 in nscp

Timestamp:

08/10/11 21:39:27 (23 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

130777fe

Parents:

54ac968

Message:

removed protobuf/log.proto.h and moved alll includes to target dir instead...

Files:

• CMakeLists.txt (modified) (3 diffs)
• build/cmake/NSCPPBuffer.cmake (modified) (1 diff)
• include/nscapi/functions.hpp (modified) (1 diff)
• include/nscapi/nscapi_core_wrapper.cpp (modified) (1 diff)
• include/nscapi/nscapi_plugin_wrapper.cpp (modified) (1 diff)
• libs/protobuf/log.proto.h (deleted)
• libs/protobuf/log.proto.h.in (deleted)
• libs/protobuf/plugin.proto.h.in (deleted)
• service/NSClient++.cpp (modified) (1 diff)
• service/logger.hpp (modified) (1 diff)

CMakeLists.txt

@@ -164 +164 @@
 
 
-INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR})
+INCLUDE_DIRECTORIES(${NSCP_INCLUDEDIR} ${CMAKE_CURRENT_BINARY_DIR}/libs)
 SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};${OPENSSL_LIBRARY_DIR};${NSCP_LIBRARYDIR};${BOOST_LIBRARYDIR}")
 
@@ -360 +360 @@
 # ${NSCP_INCLUDEDIR}/nscapi/settings_proxy.hpp
   ${NSCP_INCLUDEDIR}/nscapi/macros.hpp
+  ${NSCP_INCLUDEDIR}/nscapi/functions.hpp
 )
 
@@ -380 +381 @@
   ${Boost_THREAD_LIBRARY}
   ${Boost_SYSTEM_LIBRARY}
+  ${Boost_REGEX_LIBRARY}
+  ${Boost_FILESYSTEM_LIBRARY}
   ${EXTRA_LIBS}
   ${PROTOBUF_LIBRARY}

build/cmake/NSCPPBuffer.cmake

@@ -90 +90 @@
     
     SET(PB_TARGET_INCLUDE ${INCL})
-    configure_file(${ABS_FIL}.h.in ${ABS_FIL}.h)
+    #configure_file(${ABS_FIL}.h.in ${ABS_FIL}.h)
 
       ADD_CUSTOM_COMMAND(

include/nscapi/functions.hpp

@@ -36 +36 @@
 #include <nscapi/settings_proxy.hpp>
 
-#include "../libs/protobuf/plugin.proto.h"
-#include "../libs/protobuf/log.proto.h"
+#include <protobuf/plugin.pb.h>
+#include <protobuf/log.pb.h>
 
 using namespace nscp::helpers;

include/nscapi/nscapi_core_wrapper.cpp

@@ -31 +31 @@
 #include <settings/macros.h>
 
-#include "../libs/protobuf/plugin.proto.h"
-#include "../libs/protobuf/log.proto.h"
+#include <protobuf/plugin.pb.h>
+#include <protobuf/log.pb.h>
 
 using namespace nscp::helpers;

include/nscapi/nscapi_plugin_wrapper.cpp

@@ -34 +34 @@
 #include <boost/tokenizer.hpp>
 
-#include "../libs/protobuf/plugin.proto.h"
-#include "../libs/protobuf/log.proto.h"
+#include <protobuf/plugin.pb.h>
+#include <protobuf/log.pb.h>
 
 using namespace nscp::helpers;

service/NSClient++.cpp

@@ -45 +45 @@
 #include "../version.hpp"
 
-#include "../libs/protobuf/plugin.proto.h"
+#include "../libs/protobuf/plugin.pb.h"
 
 #ifdef USE_BREAKPAD

service/logger.hpp

@@ -6 +6 @@
 #include <boost/thread/mutex.hpp>
 
-#include "../libs/protobuf/log.proto.h"
+#include <protobuf/log.pb.h>
 
 #include <strEx.h>