Changeset 242

Timestamp:

01/31/10 14:18:08 (2 years ago)

Author:

mickem

Message:

Made some changes to facilitate building protocol buffer files from cmake

Location:

trunk

Files:

• CMakeLists.txt (modified) (5 diffs)
• cmake/NSCPPBuffer.cmake (modified) (1 diff)
• include/NSCHelper.h (modified) (1 diff)
• modules/CheckHelpers/CMakeLists.txt (modified) (1 diff)
• modules/NRPEClient/CMakeLists.txt (modified) (2 diffs)
• modules/NRPEServer/CMakeLists.txt (modified) (2 diffs)
• modules/Scheduler/CMakeLists.txt (modified) (1 diff)
• proto/plugin.proto.h.in (added)
• service/CMakeLists.txt (modified) (2 diffs)
• service/NSClient++.cpp (modified) (1 diff)

trunk/CMakeLists.txt

@@ -26 +26 @@
 
 SET(NSCP_INCLUDE_PATH "${NSCP_SOURCE_DIR}/include" CACHE PATH "directory containing NSCP specific includes")
-SET(PBUF_INCLUDE_PATH "${NSCP_SOURCE_DIR}/proto" CACHE PATH "directory containing NSCP specific protocol buffer files")
+SET(PB_PATH "${NSCP_SOURCE_DIR}/proto" CACHE PATH "directory containing NSCP specific protocol buffer files")
 INCLUDE_DIRECTORIES(${NSCP_INCLUDE_PATH})
-INCLUDE_DIRECTORIES(${PBUF_INCLUDE_PATH})
+INCLUDE_DIRECTORIES(${PB_PATH})
 
 SET(BOOST_LIBRARYDIR ${BOOST_LIBRARYDIR} CACHE PATH "")
@@ -89 +89 @@
   message(STATUS, "Found proto in: ${PROTOBUF_LIBRARY}")
   INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
-  #LINK_DIRECTORIES(${BOOST_LIB_DIRS})
 else(PROTOBUF_FOUND)
   message(FATAL_ERROR, "Protocol buffers NOT found (${PROTOBUF_LIBRARYDIR}, )")
@@ -147 +146 @@
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-
 SET(NSCP_DEF_PLUGIN_CPP
   ${NSCP_INCLUDE_PATH}/NSCHelper.cpp
@@ -153 +151 @@
   ${NSCP_INCLUDE_PATH}/simpleini/ConvertUTF.c
   ${NSCP_INCLUDE_PATH}/b64/b64.c
-  ${PBUF_INCLUDE_PATH}/plugin.pb.cc
   ${NSCP_INCLUDE_PATH}/utils.cpp
-  )
+)
 
 SET(NSCP_DEF_PLUGIN_HPP
-    ${PBUF_INCLUDE_PATH}/plugin.pb.h
-    ${NSCP_INCLUDE_PATH}/NSCHelper.h
-    ${NSCP_INCLUDE_PATH}/strEx.h
-    ${NSCP_INCLUDE_PATH}/config.h
-    ${NSCP_INCLUDE_PATH}/utils.h
-    ${NSCP_INCLUDE_PATH}/NSCAPI.h
-    ${NSCP_INCLUDE_PATH}/NSCHelper.h
-    ${NSCP_INCLUDE_PATH}/nsc_module_wrapper.hpp
-  )
+  ${NSCP_INCLUDE_PATH}/NSCHelper.h
+  ${NSCP_INCLUDE_PATH}/strEx.h
+  ${NSCP_INCLUDE_PATH}/config.h
+  ${NSCP_INCLUDE_PATH}/utils.h
+  ${NSCP_INCLUDE_PATH}/NSCAPI.h
+  ${NSCP_INCLUDE_PATH}/NSCHelper.h
+  ${NSCP_INCLUDE_PATH}/nsc_module_wrapper.hpp
+)
 
 SET(NSCP_DEF_PLUGIN_LIB
-    ${Boost_LIBRARIES}
-    ${CMAKE_THREAD_LIBS_INIT}
-    ${EXTRA_LIBS}
-    ${PROTOBUF_LIBRARY}
-  )
+  ${Boost_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${EXTRA_LIBS}
+  ${PROTOBUF_LIBRARY}
+  proto
+)
+  message(STATUS, "LIB: ${NSCP_DEF_PLUGIN_LIB}")
 
 
@@ -191 +189 @@
 MESSAGE(STATUS "Build path: ${PROJECT_BINARY_DIR}")
 ADD_SUBDIRECTORY("service")
+ADD_SUBDIRECTORY("proto")
 
 SET(ALL_MODULE_NAMES)

trunk/cmake/NSCPPBuffer.cmake

@@ -68 +68 @@
       LIST(APPEND ${VAR} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
       LIST(APPEND INCL "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+    
+    SET(PB_TARGET_INCLUDE ${INCL})
+    configure_file(${ABS_FIL}.h.in ${ABS_FIL}.h)
 
       ADD_CUSTOM_COMMAND(

trunk/include/NSCHelper.h

@@ -33 +33 @@
 #include <strEx.h>
 
-#include "../proto/plugin.pb.h"
+#include "../proto/plugin.proto.h"
 
 #ifdef WIN32

trunk/modules/CheckHelpers/CMakeLists.txt

@@ -2 +2 @@
   
 PROJECT(CheckHelpers)
+
+# Workaround for bug 0003353 in cmake (aparently not fixed)
+SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE)
 
 SET(CheckHelpers_SRCS

trunk/modules/NRPEClient/CMakeLists.txt

@@ -4 +4 @@
   
 PROJECT(${TARGET})
+
+# Workaround for bug 0003353 in cmake (aparently not fixed)
+SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE)
 
 SET(SRCS
@@ -31 +34 @@
 target_link_libraries(${TARGET}
   ${Boost_FILESYSTEM_LIBRARY}
-  ${PROTOBUF_LIBRARY}
+  ${NSCP_DEF_PLUGIN_LIB}
   ${OPENSSL_LIBRARIES}
 )

trunk/modules/NRPEServer/CMakeLists.txt

@@ -4 +4 @@
   
 PROJECT(${TARGET})
+
+# Workaround for bug 0003353 in cmake (aparently not fixed)
+SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE)
 
 SET(SRCS
@@ -38 +41 @@
 target_link_libraries(${TARGET}
   ${Boost_FILESYSTEM_LIBRARY}
-  ${PROTOBUF_LIBRARY}  ${Boost_LIBRARIES}
+  ${NSCP_DEF_PLUGIN_LIB}
   ${OPENSSL_LIBRARIES}
 )

trunk/modules/Scheduler/CMakeLists.txt

@@ -2 +2 @@
   
 PROJECT(Scheduler)
+
+# Workaround for bug 0003353 in cmake (aparently not fixed)
+SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE)
 
 SET(Scheduler_SRCS

trunk/service/CMakeLists.txt

@@ -7 +7 @@
 
 ADD_DEFINITIONS(${NSCP_GLOBAL_DEFINES})
+
+# Workaround for bug 0003353 in cmake (aparently not fixed)
+#WRAP_PROTO(PB_PLUGIN ${PB_PATH}/plugin.pb)
+#SET_SOURCE_FILES_PROPERTIES(${PB_PLUGIN} PROPERTIES GENERATED TRUE)
 
 SET(service_SRCS
@@ -73 +77 @@
 target_link_libraries(nsclient++ 
   ${Boost_FILESYSTEM_LIBRARY}
-  ${PROTOBUF_LIBRARY}
+  ${NSCP_DEF_PLUGIN_LIB}
 )
 

trunk/service/NSClient++.cpp

@@ -40 +40 @@
 #include "service_manager.hpp"
 
-#include "../proto/plugin.pb.h"
+#include "../proto/plugin.proto.h"
 
 NSClient mainClient(SZSERVICENAME); // Global core instance.