Merge pull request #307 from allywarner/Seg3DLib_build_script

Seg3dlib build script

Author: allywarner

Superbuild/Superbuild.cmake

@@ -105,8 +105,25 @@ ENDIF()
 
 OPTION(BUILD_WITH_PYTHON "Build with python support." ON)
 
-
 ###########################################
+# Configure Seg3D library build
+###########################################
+
+IF((WIN32) AND (MSVC_VERSION GREATER 1900))
+
+  OPTION(BUILD_STANDALONE_LIBRARY "Build with a Seg3D library build." OFF)
+
+  IF(BUILD_STANDALONE_LIBRARY)
+    SET(BUILD_TESTING OFF)
+    SET(BUILD_WITH_PYTHON OFF)
+    SET(SUPERBUILD_LIBS_SOURCE_DIR ${CMAKE_BINARY_DIR})
+  ENDIF()
+
+ENDIF()
+
+OPTION(BUILD_MANUAL_TOOLS_ONLY "Build Seg3D library with only manual tools." OFF)
+
+###########################################ß
 # Travis CI build needs to be as slim as possible
 ###########################################
 
@@ -126,7 +143,6 @@ ELSE()
   SET(ENABLED_WARNINGS "-Wall")
 ENDIF()
 
-
 ###########################################
 # Configure Qt
 ###########################################
@@ -165,14 +181,12 @@ IF(SEG3D_BUILD_INTERFACE)
 
 ENDIF()
 
-
 ###########################################
 # Configure sample data download
 ###########################################
 
 OPTION(DOWNLOAD_DATA "Download Seg3D sample and test data repository." ON)
 
-
 ###########################################
 # *Nix C++ compiler flags
 ###########################################
@@ -288,7 +302,10 @@ SET(SEG3D_CACHE_ARGS
     "-DSEG3D_BUILD_INTERFACE:BOOL=${SEG3D_BUILD_INTERFACE}"
     "-DSEG3D_SHOW_CONSOLE:BOOL=${SEG3D_SHOW_CONSOLE}"
     "-DBUILD_WITH_PYTHON:BOOL=${BUILD_WITH_PYTHON}"
+    "-DBUILD_STANDALONE_LIBRARY:BOOL=${BUILD_STANDALONE_LIBRARY}"
+    "-DSEG3D_MANUAL_TOOLS_ONLY:BOOL=${SEG3D_MANUAL_TOOLS_ONLY}"
     "-DDO_ZLIB_MANGLE:BOOL=${DO_ZLIB_MANGLE}"
+    "-DSUPERBUILD_LIBS_SOURCE_DIR:PATH=${SUPERBUILD_LIBS_SOURCE_DIR}"
     "-DZlib_DIR:PATH=${Zlib_DIR}"
     "-DLibPNG_DIR:PATH=${LibPNG_DIR}"
     "-DSQLite_DIR:PATH=${SQLite_DIR}"

src/Application/Tool/ToolFactory.cc

@@ -95,32 +95,50 @@ ToolFactory::~ToolFactory()
 {
 }
 
-void ToolFactory::register_tool( ToolBuilderBase* builder, ToolInfoHandle info, 
-  std::string tool_name )
+#ifdef SEG3D_MANUAL_TOOLS_ONLY
+static std::set<std::string> nonManualTools = { "croptool", "resampletool", "thresholdtool", "cannyedgedetectionfilter",
+"confidenceconnectedfilter", "connectedcomponentfilter", "curvatureanisotropicdiffusionfilter",
+"discretegaussianfilter", "distancefilter", "extractdatalayer", "gradientanisotropicdiffusionfilter",
+"gradientmagnitudefilter", "histogramequalizationfilter", "intensitycorrectionfilter",
+"maskdatafilter", "medianfilter", "meanfilter", "neighborhoodconnectedfilter",
+"otsuthresholdfilter", "thresholdsegmentationlsfilter", "transformtool", "measurementtool",
+"pointsetfilter", "speedlinetool", "pointsselecttool", "padtool", "implicitmodeltool", "watershedfilter" };
+#endif
+
+void ToolFactory::register_tool(ToolBuilderBase* builder, ToolInfoHandle info,
+  std::string tool_name)
 {
-  tool_name = Core::StringToLower( tool_name );
+  tool_name = Core::StringToLower(tool_name);
 
-  lock_type lock( this->get_mutex() );
+#ifdef SEG3D_MANUAL_TOOLS_ONLY
+ //When building a library, we don't want to include the tools in nonManualTools
+    if (nonManualTools.find(tool_name) != nonManualTools.end())
+    {
+      return;
+    }
+#endif
+
+  lock_type lock(this->get_mutex());
 
   // Test is tool was registered before.
-  if ( this->private_->tools_.find( tool_name ) != this->private_->tools_.end() )
+  if (this->private_->tools_.find(tool_name) != this->private_->tools_.end())
   {
     // Actions that are registered twice, will cause problems
     // Hence the program will throw an exception.
     // As registration is done on startup, this will cause a
     // faulty program to fail always on startup.
-    CORE_THROW_LOGICERROR( std::string( "Tool '" ) + tool_name + "' is registered twice" );
+    CORE_THROW_LOGICERROR(std::string("Tool '") + tool_name + "' is registered twice");
   }
 
   // Register the action and set its properties 
   ToolEntry entry;
   entry.builder_ = builder;
   entry.info_ = info;
-  this->private_->tools_[ tool_name ] = entry;
+  this->private_->tools_[tool_name] = entry;
 
-  this->private_->tool_menus_.insert( info->get_menu() );
-  
-  CORE_LOG_DEBUG( std::string( "Registering tool : " ) + tool_name );
+  this->private_->tool_menus_.insert(info->get_menu());
+
+  CORE_LOG_DEBUG(std::string("Registering tool : ") + tool_name);
 }
 
 void ToolFactory::register_toolinterface( ToolInterfaceBuilderBase* builder,

src/CMake/Scripts/build_full_static_lib.bat.in

@@ -0,0 +1,21 @@
+SET all_libs_dest_dir=@ALL_LIBS_DEST_DIR@
+SET superbuild_dir=@SUPERBUILD_LIBS_SOURCE_DIR_CMD@
+SET zlib_file=@ZLIB_FILE@
+SET vs_bin_path=@_vs_bin_path@
+SET dependencies_dest_dir=@DEPENDENCIES_DEST_DIR@
+SET batch_file_path=@BATCH_FILE_PATH@
+SET lib_tool_path=@LIB_TOOL_PATH@
+
+rmdir /S /Q %all_libs_dest_dir%
+mkdir %all_libs_dest_dir%
+
+cd %superbuild_dir%
+for /r %%A IN (*.lib) DO copy %%A %all_libs_dest_dir%
+copy %zlib_file% %all_libs_dest_dir%
+del %all_libs_dest_dir%\Seg3D_lib.lib
+del %all_libs_dest_dir%\Seg3D_dependencies.lib
+del %all_libs_dest_dir%\Seg3D_lib_complete.lib
+
+del %dependencies_dest_dir%\Seg3D_dependencies.lib
+del %dependencies_dest_dir%\Seg3D_lib_complete.lib
+%batch_file_path% & %lib_tool_path% /OUT:%dependencies_dest_dir%\Seg3D_dependencies.lib %all_libs_dest_dir%\*.lib & %lib_tool_path% /OUT:%dependencies_dest_dir%\Seg3D_lib_complete.lib %dependencies_dest_dir%\*.lib

src/CMakeLists.txt

@@ -144,6 +144,14 @@ ELSE()
   ADD_DEFINITIONS(-DSCI_32BITS)
 ENDIF()
 
+IF(BUILD_STANDALONE_LIBRARY)
+  MESSAGE("Library build successful")
+  ADD_DEFINITIONS(-DBUILD_STANDALONE_LIBRARY)
+ENDIF()
+
+IF(SEG3D_MANUAL_TOOLS_ONLY)
+  ADD_DEFINITIONS(-DSEG3D_MANUAL_TOOLS_ONLY)
+ENDIF()
 
 ###########################################
 # Microsoft VC compiler flags