Added: CMake projects for pipeline

--HG--
branch : build_pipeline_v3

code/CMakeModules/nel.cmake

@@ -248,6 +248,7 @@ MACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
   OPTION(WITH_NEL_MAXPLUGIN       "Build NeL 3dsMax Plugin"                       OFF)
   OPTION(WITH_NEL_SAMPLES         "Build NeL Samples"                             ON )
   OPTION(WITH_NEL_TESTS           "Build NeL Unit Tests"                          ON )
+  OPTION(WITH_NEL_PIPELINE        "Build NeL Pipeline"                            ON )
 ENDMACRO(NL_SETUP_NEL_DEFAULT_OPTIONS)
 
 MACRO(NL_SETUP_NELNS_DEFAULT_OPTIONS)

code/nel/tools/3d/build_interface/CMakeLists.txt

@@ -1,5 +1,7 @@
 FILE(GLOB SRC *.cpp *.h)
 
+SOURCE_GROUP("" FILES ${SRC})
+
 ADD_EXECUTABLE(build_interface ${SRC})
 
 TARGET_LINK_LIBRARIES(build_interface nelmisc)

code/nel/tools/CMakeLists.txt

@@ -25,4 +25,8 @@ IF(WITH_NEL_TESTS)
   ADD_SUBDIRECTORY(nel_unit_test)
 ENDIF(WITH_NEL_TESTS)
 
+IF(WITH_NEL_PIPELINE)
+  ADD_SUBDIRECTORY(pipeline)
+ENDIF(WITH_NEL_PIPELINE)
+
 #build_gamedata

code/nel/tools/pipeline/CMakeLists.txt

@@ -0,0 +1,4 @@
+SUBDIRS(
+		plugin_library
+		plugin_max
+		service)

code/nel/tools/pipeline/plugin_library/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(pipeline_plugin_library STATIC ${SRC})
+
+TARGET_LINK_LIBRARIES(pipeline_plugin_library nelmisc)
+
+NL_DEFAULT_PROPS(pipeline_plugin_library "Pipeline Plugin Library")
+NL_ADD_LIB_SUFFIX(pipeline_plugin_library)
+NL_ADD_RUNTIME_FLAGS(pipeline_plugin_library)
+
+INSTALL(TARGETS pipeline_plugin_library RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

code/nel/tools/pipeline/plugin_library/tool_logger.h

@@ -34,7 +34,7 @@
 #include <string>
 
 // NeL includes
-#include <nel/misc/file.h>
+#include <nel/misc/time_nl.h>
 #include <nel/misc/string_common.h>
 
 // Project includes

code/nel/tools/pipeline/plugin_max/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_LIBRARY(pipeline_plugin_max MODULE ${SRC})
+
+TARGET_LINK_LIBRARIES(pipeline_plugin_max pipeline_plugin_library nelmisc)
+
+NL_DEFAULT_PROPS(pipeline_plugin_max "Pipeline Plugin Max")
+NL_ADD_LIB_SUFFIX(pipeline_plugin_max)
+NL_ADD_RUNTIME_FLAGS(pipeline_plugin_max)
+
+INSTALL(TARGETS pipeline_plugin_max LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin COMPONENT pipeline)

code/nel/tools/pipeline/plugin_max/pipeline_plugin_max.cpp

@@ -35,7 +35,7 @@
 #include "nel/misc/debug.h"
 
 // Project includes
-#include "../pipeline_library/pipeline_interface.h"
+#include "../plugin_library/pipeline_interface.h"
 #include "process_max_shape.h"
 
 using namespace std;

code/nel/tools/pipeline/plugin_max/process_max_shape.cpp

@@ -36,7 +36,7 @@
 #include <nel/misc/task_manager.h>
 
 // Project includes
-#include "../pipeline_library/pipeline_interface.h"
+#include "../plugin_library/pipeline_interface.h"
 
 using namespace std;
 // using namespace NLMISC;

code/nel/tools/pipeline/plugin_max/process_max_shape.h

@@ -34,7 +34,7 @@
 // NeL includes
 
 // Project includes
-#include "../pipeline_library/process_plugin.h"
+#include "../plugin_library/process_plugin.h"
 
 namespace PIPELINE {
 

code/nel/tools/pipeline/service/CMakeLists.txt

@@ -0,0 +1,13 @@
+FILE(GLOB SRC *.cpp *.h)
+
+SOURCE_GROUP("" FILES ${SRC})
+
+ADD_EXECUTABLE(pipeline_service WIN32 ${SRC})
+
+INCLUDE_DIRECTORIES(${BOOST_ROOT})
+TARGET_LINK_LIBRARIES(pipeline_service pipeline_plugin_library nelmisc nelnet nelgeorges)
+
+NL_DEFAULT_PROPS(pipeline_service "Pipeline Service")
+NL_ADD_RUNTIME_FLAGS(pipeline_service)
+
+INSTALL(TARGETS pipeline_service RUNTIME DESTINATION bin COMPONENT pipeline)

code/nel/tools/pipeline/service/pipeline_interface_impl.h

@@ -36,7 +36,7 @@
 // NeL includes
 
 // Project includes
-#include "../pipeline_library/pipeline_interface.h"
+#include "../plugin_library/pipeline_interface.h"
 
 namespace PIPELINE {
 

code/nel/tools/pipeline/service/pipeline_service.h

@@ -41,7 +41,7 @@ namespace NLMISC {
 }
 
 namespace PIPELINE {
-
+/*
 #if defined(PIPELINE_MASTER)
 #	if defined(PIPELINE_SLAVE)
 #		error Cannot define both PIPELINE_MASTER and PIPELINE_SLAVE at the same time.
@@ -50,6 +50,9 @@ namespace PIPELINE {
 #else
 #	error Must define either PIPELINE_MASTER or PIPELINE_SLAVE. Create 2 projects that output pipeline_service_master and pipeline_service_slave executables.
 #endif
+*/
+
+#define PIPELINE_MASTER
 
 extern std::string g_DatabaseDirectory;
 extern std::string g_PipelineDirectory;